OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add the default region texture UUIDS back in that were lost in 

the shuffle. Translate LLUUID.Zero to the default textures on set.
This should fix the default button in the viewer.
0.6.0-stable
Melanie Thielker 2008-08-19 21:18:48 +00:00
parent 40fa68d3e5
commit fc83af4bf6
1 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
OpenSim/Framework/RegionSettings.cs
View File

@ -70,19 +70,19 @@ namespace OpenSim.Framework
configMember.addConfigurationOption("terrain_base_0", configMember.addConfigurationOption("terrain_base_0",
ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
String.Empty, "00000000-0000-0000-0000-000000000000",true); String.Empty, "b8d3965a-ad78-bf43-699b-bff8eca6c975",true);
configMember.addConfigurationOption("terrain_base_1", configMember.addConfigurationOption("terrain_base_1",
ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
String.Empty, "00000000-0000-0000-0000-000000000000",true); String.Empty, "abb783e6-3e93-26c0-248a-247666855da3",true);
configMember.addConfigurationOption("terrain_base_2", configMember.addConfigurationOption("terrain_base_2",
ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
String.Empty, "00000000-0000-0000-0000-000000000000",true); String.Empty, "179cdabd-398a-9b6b-1391-4dc333ba321f",true);
configMember.addConfigurationOption("terrain_base_3", configMember.addConfigurationOption("terrain_base_3",
ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
String.Empty, "00000000-0000-0000-0000-000000000000",true); String.Empty, "beb169c7-11ea-fff2-efe5-0f24dc881df2",true);
configMember.addConfigurationOption("terrain_start_height_0", configMember.addConfigurationOption("terrain_start_height_0",
ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE, ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE,
@ -354,7 +354,13 @@ namespace OpenSim.Framework
public LLUUID TerrainTexture1 public LLUUID TerrainTexture1
{ {
get { return m_TerrainTexture1; } get { return m_TerrainTexture1; }
set { m_TerrainTexture1 = value; } set
{
if (value == LLUUID.Zero)
m_TerrainTexture1 = new LLUUID("b8d3965a-ad78-bf43-699b-bff8eca6c975");
else
m_TerrainTexture1 = value;
}
} }
private LLUUID m_TerrainTexture2 = LLUUID.Zero; private LLUUID m_TerrainTexture2 = LLUUID.Zero;
@ -362,7 +368,13 @@ namespace OpenSim.Framework
public LLUUID TerrainTexture2 public LLUUID TerrainTexture2
{ {
get { return m_TerrainTexture2; } get { return m_TerrainTexture2; }
set { m_TerrainTexture2 = value; } set
{
if (value == LLUUID.Zero)
m_TerrainTexture2 = new LLUUID("abb783e6-3e93-26c0-248a-247666855da3");
else
m_TerrainTexture2 = value;
}
} }
private LLUUID m_TerrainTexture3 = LLUUID.Zero; private LLUUID m_TerrainTexture3 = LLUUID.Zero;
@ -370,7 +382,13 @@ namespace OpenSim.Framework
public LLUUID TerrainTexture3 public LLUUID TerrainTexture3
{ {
get { return m_TerrainTexture3; } get { return m_TerrainTexture3; }
set { m_TerrainTexture3 = value; } set
{
if (value == LLUUID.Zero)
m_TerrainTexture3 = new LLUUID("179cdabd-398a-9b6b-1391-4dc333ba321f");
else
m_TerrainTexture3 = value;
}
} }
private LLUUID m_TerrainTexture4 = LLUUID.Zero; private LLUUID m_TerrainTexture4 = LLUUID.Zero;
@ -378,7 +396,13 @@ namespace OpenSim.Framework
public LLUUID TerrainTexture4 public LLUUID TerrainTexture4
{ {
get { return m_TerrainTexture4; } get { return m_TerrainTexture4; }
set { m_TerrainTexture4 = value; } set
{
if (value == LLUUID.Zero)
m_TerrainTexture4 = new LLUUID("beb169c7-11ea-fff2-efe5-0f24dc881df2");
else
m_TerrainTexture4 = value;
}
} }
private double m_Elevation1NW = 10; private double m_Elevation1NW = 10;