lotek/opensim
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Upgrade ground textures, closes #1

Browse Source
This commit is contained in:
lickx
2022-08-17 14:17:19 +02:00
committed by lickx
parent 1eb6f8fed9
commit 154750c31d
7 changed files with 40 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Framework/RegionSettings.cs
View File

@@ -110,10 +110,10 @@ namespace OpenSim.Framework
/// <value>
/// These appear to be terrain textures that are shipped with the client.
/// </value>
public static readonly UUID DEFAULT_TERRAIN_TEXTURE_1 = new("b8d3965a-ad78-bf43-699b-bff8eca6c975");
public static readonly UUID DEFAULT_TERRAIN_TEXTURE_2 = new("abb783e6-3e93-26c0-248a-247666855da3");
public static readonly UUID DEFAULT_TERRAIN_TEXTURE_3 = new("179cdabd-398a-9b6b-1391-4dc333ba321f");
public static readonly UUID DEFAULT_TERRAIN_TEXTURE_4 = new("beb169c7-11ea-fff2-efe5-0f24dc881df2");
public static readonly UUID DEFAULT_TERRAIN_TEXTURE_1 = new("0bc58228-74a0-7e83-89bc-5c23464bcec5");
public static readonly UUID DEFAULT_TERRAIN_TEXTURE_2 = new("63338ede-0037-c4fd-855b-015d77112fc8");
public static readonly UUID DEFAULT_TERRAIN_TEXTURE_3 = new("303cd381-8560-7579-23f1-f0a880799740");
public static readonly UUID DEFAULT_TERRAIN_TEXTURE_4 = new("53a2f406-4895-1d13-d541-d2e3b86bc19c");
public static readonly UUID DEFAULT_TERRAIN_PBR_1 = new("b8d3965a-ad78-bf43-699b-bff8eca6c975");
public static readonly UUID DEFAULT_TERRAIN_PBR_2 = new("abb783e6-3e93-26c0-248a-247666855da3");

BIN
bin/assets/TexturesAssetSet/0bc58228-74a0-7e83-89bc-5c23464bcec5.j2c Normal file
View File

Binary file not shown.

BIN
bin/assets/TexturesAssetSet/303cd381-8560-7579-23f1-f0a880799740.j2c Normal file
View File

Binary file not shown.

BIN
bin/assets/TexturesAssetSet/53a2f406-4895-1d13-d541-d2e3b86bc19c.j2c Normal file
View File

Binary file not shown.

BIN
bin/assets/TexturesAssetSet/63338ede-0037-c4fd-855b-015d77112fc8.j2c Normal file
View File

Binary file not shown.

39
bin/assets/TexturesAssetSet/TexturesAssetSet.xml
View File

@@ -375,26 +375,51 @@
</Section>
<Section Name="Terrain Dirt">
<Key Name="assetID" Value="b8d3965a-ad78-bf43-699b-bff8eca6c975"/>
<Key Name="assetID" Value="0bc58228-74a0-7e83-89bc-5c23464bcec5"/>
<Key Name="name" Value="Terrain Dirt"/>
<Key Name="assetType" Value="0" />
<Key Name="fileName" Value="0bc58228-74a0-7e83-89bc-5c23464bcec5.j2c" />
</Section>
<Section Name="Terrain Grass">
<Key Name="assetID" Value="63338ede-0037-c4fd-855b-015d77112fc8"/>
<Key Name="name" Value="Terrain Grass"/>
<Key Name="assetType" Value="0" />
<Key Name="fileName" Value="63338ede-0037-c4fd-855b-015d77112fc8.j2c" />
</Section>
<Section Name="Terrain Mountain">
<Key Name="assetID" Value="303cd381-8560-7579-23f1-f0a880799740"/>
<Key Name="name" Value="Terrain Mountain"/>
<Key Name="assetType" Value="0" />
<Key Name="fileName" Value="303cd381-8560-7579-23f1-f0a880799740.j2c" />
</Section>
<Section Name="Terrain Rock">
<Key Name="assetID" Value="53a2f406-4895-1d13-d541-d2e3b86bc19c"/>
<Key Name="name" Value="Terrain Rock"/>
<Key Name="assetType" Value="0" />
<Key Name="fileName" Value="53a2f406-4895-1d13-d541-d2e3b86bc19c.j2c" />
</Section>
<Section Name="Terrain Dirt (legacy)">
<Key Name="assetID" Value="b8d3965a-ad78-bf43-699b-bff8eca6c975"/>
<Key Name="name" Value="Terrain Dirt (legacy)"/>
<Key Name="assetType" Value="0" />
<Key Name="fileName" Value="Terrain Dirt-b8d3965a-ad78-bf43-699b-bff8eca6c975.texture" />
</Section>
<Section Name="Terrain Grass">
<Section Name="Terrain Grass (legacy)">
<Key Name="assetID" Value="abb783e6-3e93-26c0-248a-247666855da3"/>
<Key Name="name" Value="Terrain Grass"/>
<Key Name="name" Value="Terrain Grass (legacy)"/>
<Key Name="assetType" Value="0" />
<Key Name="fileName" Value="Terrain Grass-abb783e6-3e93-26c0-248a-247666855da3.texture" />
</Section>
<Section Name="Terrain Mountain">
<Section Name="Terrain Mountain (legacy)">
<Key Name="assetID" Value="179cdabd-398a-9b6b-1391-4dc333ba321f"/>
<Key Name="name" Value="Terrain Mountain"/>
<Key Name="name" Value="Terrain Mountain (legacy)"/>
<Key Name="assetType" Value="0" />
<Key Name="fileName" Value="Terrain Mountain-179cdabd-398a-9b6b-1391-4dc333ba321f.texture" />
</Section>
<Section Name="Terrain Rock">
<Section Name="Terrain Rock (legacy)">
<Key Name="assetID" Value="beb169c7-11ea-fff2-efe5-0f24dc881df2"/>
<Key Name="name" Value="Terrain Rock"/>
<Key Name="name" Value="Terrain Rock (legacy)"/>
<Key Name="assetType" Value="0" />
<Key Name="fileName" Value="Terrain Rock-beb169c7-11ea-fff2-efe5-0f24dc881df2.texture" />
</Section>

8
bin/inventory/TexturesLibrary/TexturesLibraryItems.xml
View File

@@ -516,7 +516,7 @@
<Section Name="Terrain Dirt">
<Key Name="inventoryID" Value="00000000-0000-2222-9999-000000000006"/>
<Key Name="assetID" Value="b8d3965a-ad78-bf43-699b-bff8eca6c975"/>
<Key Name="assetID" Value="0bc58228-74a0-7e83-89bc-5c23464bcec5"/>
<Key Name="folderID" Value="00000112-000f-0000-0000-000100bba001"/>
<Key Name="description" Value="" />
<Key Name="name" Value="Terrain Dirt" />
@@ -526,7 +526,7 @@
<Section Name="Terrain Grass">
<Key Name="inventoryID" Value="00000000-0000-2222-9999-000000000007"/>
<Key Name="assetID" Value="abb783e6-3e93-26c0-248a-247666855da3"/>
<Key Name="assetID" Value="63338ede-0037-c4fd-855b-015d77112fc8"/>
<Key Name="folderID" Value="00000112-000f-0000-0000-000100bba001"/>
<Key Name="description" Value="" />
<Key Name="name" Value="Terrain Grass" />
@@ -536,7 +536,7 @@
<Section Name="Terrain Mountain">
<Key Name="inventoryID" Value="00000000-0000-2222-9999-000000000008"/>
<Key Name="assetID" Value="179cdabd-398a-9b6b-1391-4dc333ba321f"/>
<Key Name="assetID" Value="303cd381-8560-7579-23f1-f0a880799740"/>
<Key Name="folderID" Value="00000112-000f-0000-0000-000100bba001"/>
<Key Name="description" Value="" />
<Key Name="name" Value="Terrain Mountain" />
@@ -546,7 +546,7 @@
<Section Name="Terrain Rock">
<Key Name="inventoryID" Value="00000000-0000-2222-9999-000000000009"/>
<Key Name="assetID" Value="beb169c7-11ea-fff2-efe5-0f24dc881df2"/>
<Key Name="assetID" Value="53a2f406-4895-1d13-d541-d2e3b86bc19c"/>
<Key Name="folderID" Value="00000112-000f-0000-0000-000100bba001"/>
<Key Name="description" Value="" />
<Key Name="name" Value="Terrain Rock" />