aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie Thielker2008-08-19 21:18:48 +0000
committerMelanie Thielker2008-08-19 21:18:48 +0000
commitfc83af4bf66d6b2dbc6fbdd36e91a486b422c1d6 (patch)
tree0cd4d8be78a0bc495e8a2d5f869c5e5a46911f12 /OpenSim/Framework
parentMantis #1999 (diff)
downloadopensim-SC_OLD-fc83af4bf66d6b2dbc6fbdd36e91a486b422c1d6.zip
opensim-SC_OLD-fc83af4bf66d6b2dbc6fbdd36e91a486b422c1d6.tar.gz
opensim-SC_OLD-fc83af4bf66d6b2dbc6fbdd36e91a486b422c1d6.tar.bz2
opensim-SC_OLD-fc83af4bf66d6b2dbc6fbdd36e91a486b422c1d6.tar.xz
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.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/RegionSettings.cs40
1 files changed, 32 insertions, 8 deletions
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs
index b6e466d..e0a60e6 100644
--- a/OpenSim/Framework/RegionSettings.cs
+++ b/OpenSim/Framework/RegionSettings.cs
@@ -70,19 +70,19 @@ namespace OpenSim.Framework
70 70
71 configMember.addConfigurationOption("terrain_base_0", 71 configMember.addConfigurationOption("terrain_base_0",
72 ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 72 ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
73 String.Empty, "00000000-0000-0000-0000-000000000000",true); 73 String.Empty, "b8d3965a-ad78-bf43-699b-bff8eca6c975",true);
74 74
75 configMember.addConfigurationOption("terrain_base_1", 75 configMember.addConfigurationOption("terrain_base_1",
76 ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 76 ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
77 String.Empty, "00000000-0000-0000-0000-000000000000",true); 77 String.Empty, "abb783e6-3e93-26c0-248a-247666855da3",true);
78 78
79 configMember.addConfigurationOption("terrain_base_2", 79 configMember.addConfigurationOption("terrain_base_2",
80 ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 80 ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
81 String.Empty, "00000000-0000-0000-0000-000000000000",true); 81 String.Empty, "179cdabd-398a-9b6b-1391-4dc333ba321f",true);
82 82
83 configMember.addConfigurationOption("terrain_base_3", 83 configMember.addConfigurationOption("terrain_base_3",
84 ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 84 ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
85 String.Empty, "00000000-0000-0000-0000-000000000000",true); 85 String.Empty, "beb169c7-11ea-fff2-efe5-0f24dc881df2",true);
86 86
87 configMember.addConfigurationOption("terrain_start_height_0", 87 configMember.addConfigurationOption("terrain_start_height_0",
88 ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE, 88 ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE,
@@ -354,7 +354,13 @@ namespace OpenSim.Framework
354 public LLUUID TerrainTexture1 354 public LLUUID TerrainTexture1
355 { 355 {
356 get { return m_TerrainTexture1; } 356 get { return m_TerrainTexture1; }
357 set { m_TerrainTexture1 = value; } 357 set
358 {
359 if (value == LLUUID.Zero)
360 m_TerrainTexture1 = new LLUUID("b8d3965a-ad78-bf43-699b-bff8eca6c975");
361 else
362 m_TerrainTexture1 = value;
363 }
358 } 364 }
359 365
360 private LLUUID m_TerrainTexture2 = LLUUID.Zero; 366 private LLUUID m_TerrainTexture2 = LLUUID.Zero;
@@ -362,7 +368,13 @@ namespace OpenSim.Framework
362 public LLUUID TerrainTexture2 368 public LLUUID TerrainTexture2
363 { 369 {
364 get { return m_TerrainTexture2; } 370 get { return m_TerrainTexture2; }
365 set { m_TerrainTexture2 = value; } 371 set
372 {
373 if (value == LLUUID.Zero)
374 m_TerrainTexture2 = new LLUUID("abb783e6-3e93-26c0-248a-247666855da3");
375 else
376 m_TerrainTexture2 = value;
377 }
366 } 378 }
367 379
368 private LLUUID m_TerrainTexture3 = LLUUID.Zero; 380 private LLUUID m_TerrainTexture3 = LLUUID.Zero;
@@ -370,7 +382,13 @@ namespace OpenSim.Framework
370 public LLUUID TerrainTexture3 382 public LLUUID TerrainTexture3
371 { 383 {
372 get { return m_TerrainTexture3; } 384 get { return m_TerrainTexture3; }
373 set { m_TerrainTexture3 = value; } 385 set
386 {
387 if (value == LLUUID.Zero)
388 m_TerrainTexture3 = new LLUUID("179cdabd-398a-9b6b-1391-4dc333ba321f");
389 else
390 m_TerrainTexture3 = value;
391 }
374 } 392 }
375 393
376 private LLUUID m_TerrainTexture4 = LLUUID.Zero; 394 private LLUUID m_TerrainTexture4 = LLUUID.Zero;
@@ -378,7 +396,13 @@ namespace OpenSim.Framework
378 public LLUUID TerrainTexture4 396 public LLUUID TerrainTexture4
379 { 397 {
380 get { return m_TerrainTexture4; } 398 get { return m_TerrainTexture4; }
381 set { m_TerrainTexture4 = value; } 399 set
400 {
401 if (value == LLUUID.Zero)
402 m_TerrainTexture4 = new LLUUID("beb169c7-11ea-fff2-efe5-0f24dc881df2");
403 else
404 m_TerrainTexture4 = value;
405 }
382 } 406 }
383 407
384 private double m_Elevation1NW = 10; 408 private double m_Elevation1NW = 10;