ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 08:55:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Implement saving of region settings in OAR files

Browse Source 
* 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
This commit is contained in:
Justin Clarke Casey
2008-12-30 19:00:19 +00:00
parent c22edf01f7
commit f0ea8eb534
11 changed files with 395 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/RegionInfo.cs
View File

@@ -200,8 +200,6 @@ namespace OpenSim.Framework
private EstateSettings m_estateSettings;
private RegionSettings m_regionSettings;
// public bool m_allow_alternate_ports;
public UUID MasterAvatarAssignedUUID = UUID.Zero;
public string MasterAvatarFirstName = String.Empty;
public string MasterAvatarLastName = String.Empty;

24
OpenSim/Framework/RegionSettings.cs
View File

@@ -38,6 +38,14 @@ namespace OpenSim.Framework
public delegate void SaveDelegate(RegionSettings rs);
public event SaveDelegate OnSave;
/// <value>
/// These appear to be terrain textures that are shipped with the client.
/// </value>
public static readonly UUID DEFAULT_TERRAIN_TEXTURE_1 = new UUID("b8d3965a-ad78-bf43-699b-bff8eca6c975");
public static readonly UUID DEFAULT_TERRAIN_TEXTURE_2 = new UUID("abb783e6-3e93-26c0-248a-247666855da3");
public static readonly UUID DEFAULT_TERRAIN_TEXTURE_3 = new UUID("179cdabd-398a-9b6b-1391-4dc333ba321f");
public static readonly UUID DEFAULT_TERRAIN_TEXTURE_4 = new UUID("beb169c7-11ea-fff2-efe5-0f24dc881df2");
public RegionSettings()
{
@@ -74,19 +82,19 @@ namespace OpenSim.Framework
configMember.addConfigurationOption("terrain_base_0",
ConfigurationOption.ConfigurationTypes.TYPE_UUID,
String.Empty, "b8d3965a-ad78-bf43-699b-bff8eca6c975",true);
String.Empty, DEFAULT_TERRAIN_TEXTURE_1.ToString(), true);
configMember.addConfigurationOption("terrain_base_1",
ConfigurationOption.ConfigurationTypes.TYPE_UUID,
String.Empty, "abb783e6-3e93-26c0-248a-247666855da3",true);
String.Empty, DEFAULT_TERRAIN_TEXTURE_2.ToString(), true);
configMember.addConfigurationOption("terrain_base_2",
ConfigurationOption.ConfigurationTypes.TYPE_UUID,
String.Empty, "179cdabd-398a-9b6b-1391-4dc333ba321f",true);
String.Empty, DEFAULT_TERRAIN_TEXTURE_3.ToString(), true);
configMember.addConfigurationOption("terrain_base_3",
ConfigurationOption.ConfigurationTypes.TYPE_UUID,
String.Empty, "beb169c7-11ea-fff2-efe5-0f24dc881df2",true);
String.Empty, DEFAULT_TERRAIN_TEXTURE_4.ToString(), true);
configMember.addConfigurationOption("terrain_start_height_0",
ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE,
@@ -361,7 +369,7 @@ namespace OpenSim.Framework
set
{
if (value == UUID.Zero)
m_TerrainTexture1 = new UUID("b8d3965a-ad78-bf43-699b-bff8eca6c975");
m_TerrainTexture1 = DEFAULT_TERRAIN_TEXTURE_1;
else
m_TerrainTexture1 = value;
}
@@ -375,7 +383,7 @@ namespace OpenSim.Framework
set
{
if (value == UUID.Zero)
m_TerrainTexture2 = new UUID("abb783e6-3e93-26c0-248a-247666855da3");
m_TerrainTexture2 = DEFAULT_TERRAIN_TEXTURE_2;
else
m_TerrainTexture2 = value;
}
@@ -389,7 +397,7 @@ namespace OpenSim.Framework
set
{
if (value == UUID.Zero)
m_TerrainTexture3 = new UUID("179cdabd-398a-9b6b-1391-4dc333ba321f");
m_TerrainTexture3 = DEFAULT_TERRAIN_TEXTURE_3;
else
m_TerrainTexture3 = value;
}
@@ -403,7 +411,7 @@ namespace OpenSim.Framework
set
{
if (value == UUID.Zero)
m_TerrainTexture4 = new UUID("beb169c7-11ea-fff2-efe5-0f24dc881df2");
m_TerrainTexture4 = DEFAULT_TERRAIN_TEXTURE_4;
else
m_TerrainTexture4 = value;
}