aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-12-30 19:00:19 +0000
committerJustin Clarke Casey2008-12-30 19:00:19 +0000
commitf0ea8eb53463fe7e228537779f3f700bc6ecb74d (patch)
tree33f1a11a0dc4817557fd0578329ee7249c058371 /OpenSim/Framework
parentOpenUser_Main is now public. Fixes Mantis #2940. Thanks SirKimba (diff)
downloadopensim-SC_OLD-f0ea8eb53463fe7e228537779f3f700bc6ecb74d.zip
opensim-SC_OLD-f0ea8eb53463fe7e228537779f3f700bc6ecb74d.tar.gz
opensim-SC_OLD-f0ea8eb53463fe7e228537779f3f700bc6ecb74d.tar.bz2
opensim-SC_OLD-f0ea8eb53463fe7e228537779f3f700bc6ecb74d.tar.xz
* Implement saving of region settings in OAR files
* This means that you can now save terrain textures, water height, etc. * Estate settings are not supported * Older OAR files without these settings can still be loaded
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/RegionInfo.cs2
-rw-r--r--OpenSim/Framework/RegionSettings.cs24
2 files changed, 16 insertions, 10 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index a53bfbe..dc00059 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -200,8 +200,6 @@ namespace OpenSim.Framework
200 private EstateSettings m_estateSettings; 200 private EstateSettings m_estateSettings;
201 private RegionSettings m_regionSettings; 201 private RegionSettings m_regionSettings;
202 202
203// public bool m_allow_alternate_ports;
204
205 public UUID MasterAvatarAssignedUUID = UUID.Zero; 203 public UUID MasterAvatarAssignedUUID = UUID.Zero;
206 public string MasterAvatarFirstName = String.Empty; 204 public string MasterAvatarFirstName = String.Empty;
207 public string MasterAvatarLastName = String.Empty; 205 public string MasterAvatarLastName = String.Empty;
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs
index e1e747a..0e09fa1 100644
--- a/OpenSim/Framework/RegionSettings.cs
+++ b/OpenSim/Framework/RegionSettings.cs
@@ -38,6 +38,14 @@ namespace OpenSim.Framework
38 public delegate void SaveDelegate(RegionSettings rs); 38 public delegate void SaveDelegate(RegionSettings rs);
39 39
40 public event SaveDelegate OnSave; 40 public event SaveDelegate OnSave;
41
42 /// <value>
43 /// These appear to be terrain textures that are shipped with the client.
44 /// </value>
45 public static readonly UUID DEFAULT_TERRAIN_TEXTURE_1 = new UUID("b8d3965a-ad78-bf43-699b-bff8eca6c975");
46 public static readonly UUID DEFAULT_TERRAIN_TEXTURE_2 = new UUID("abb783e6-3e93-26c0-248a-247666855da3");
47 public static readonly UUID DEFAULT_TERRAIN_TEXTURE_3 = new UUID("179cdabd-398a-9b6b-1391-4dc333ba321f");
48 public static readonly UUID DEFAULT_TERRAIN_TEXTURE_4 = new UUID("beb169c7-11ea-fff2-efe5-0f24dc881df2");
41 49
42 public RegionSettings() 50 public RegionSettings()
43 { 51 {
@@ -74,19 +82,19 @@ namespace OpenSim.Framework
74 82
75 configMember.addConfigurationOption("terrain_base_0", 83 configMember.addConfigurationOption("terrain_base_0",
76 ConfigurationOption.ConfigurationTypes.TYPE_UUID, 84 ConfigurationOption.ConfigurationTypes.TYPE_UUID,
77 String.Empty, "b8d3965a-ad78-bf43-699b-bff8eca6c975",true); 85 String.Empty, DEFAULT_TERRAIN_TEXTURE_1.ToString(), true);
78 86
79 configMember.addConfigurationOption("terrain_base_1", 87 configMember.addConfigurationOption("terrain_base_1",
80 ConfigurationOption.ConfigurationTypes.TYPE_UUID, 88 ConfigurationOption.ConfigurationTypes.TYPE_UUID,
81 String.Empty, "abb783e6-3e93-26c0-248a-247666855da3",true); 89 String.Empty, DEFAULT_TERRAIN_TEXTURE_2.ToString(), true);
82 90
83 configMember.addConfigurationOption("terrain_base_2", 91 configMember.addConfigurationOption("terrain_base_2",
84 ConfigurationOption.ConfigurationTypes.TYPE_UUID, 92 ConfigurationOption.ConfigurationTypes.TYPE_UUID,
85 String.Empty, "179cdabd-398a-9b6b-1391-4dc333ba321f",true); 93 String.Empty, DEFAULT_TERRAIN_TEXTURE_3.ToString(), true);
86 94
87 configMember.addConfigurationOption("terrain_base_3", 95 configMember.addConfigurationOption("terrain_base_3",
88 ConfigurationOption.ConfigurationTypes.TYPE_UUID, 96 ConfigurationOption.ConfigurationTypes.TYPE_UUID,
89 String.Empty, "beb169c7-11ea-fff2-efe5-0f24dc881df2",true); 97 String.Empty, DEFAULT_TERRAIN_TEXTURE_4.ToString(), true);
90 98
91 configMember.addConfigurationOption("terrain_start_height_0", 99 configMember.addConfigurationOption("terrain_start_height_0",
92 ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE, 100 ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE,
@@ -361,7 +369,7 @@ namespace OpenSim.Framework
361 set 369 set
362 { 370 {
363 if (value == UUID.Zero) 371 if (value == UUID.Zero)
364 m_TerrainTexture1 = new UUID("b8d3965a-ad78-bf43-699b-bff8eca6c975"); 372 m_TerrainTexture1 = DEFAULT_TERRAIN_TEXTURE_1;
365 else 373 else
366 m_TerrainTexture1 = value; 374 m_TerrainTexture1 = value;
367 } 375 }
@@ -375,7 +383,7 @@ namespace OpenSim.Framework
375 set 383 set
376 { 384 {
377 if (value == UUID.Zero) 385 if (value == UUID.Zero)
378 m_TerrainTexture2 = new UUID("abb783e6-3e93-26c0-248a-247666855da3"); 386 m_TerrainTexture2 = DEFAULT_TERRAIN_TEXTURE_2;
379 else 387 else
380 m_TerrainTexture2 = value; 388 m_TerrainTexture2 = value;
381 } 389 }
@@ -389,7 +397,7 @@ namespace OpenSim.Framework
389 set 397 set
390 { 398 {
391 if (value == UUID.Zero) 399 if (value == UUID.Zero)
392 m_TerrainTexture3 = new UUID("179cdabd-398a-9b6b-1391-4dc333ba321f"); 400 m_TerrainTexture3 = DEFAULT_TERRAIN_TEXTURE_3;
393 else 401 else
394 m_TerrainTexture3 = value; 402 m_TerrainTexture3 = value;
395 } 403 }
@@ -403,7 +411,7 @@ namespace OpenSim.Framework
403 set 411 set
404 { 412 {
405 if (value == UUID.Zero) 413 if (value == UUID.Zero)
406 m_TerrainTexture4 = new UUID("beb169c7-11ea-fff2-efe5-0f24dc881df2"); 414 m_TerrainTexture4 = DEFAULT_TERRAIN_TEXTURE_4;
407 else 415 else
408 m_TerrainTexture4 = value; 416 m_TerrainTexture4 = value;
409 } 417 }