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

Save a couple of estate settings in OAR files.

Browse Source 
The settings that are saved are:
* AllowDirectTeleport - required in order to make Telehubs work
* AllowEnvironmentOverride - required in order to allow parcels to have different EEP settings from the region
This commit is contained in:
Oren Hurvitz
2021-03-07 15:52:44 +02:00
parent c1a3185df3
commit 521754ba84
5 changed files with 42 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs vendored
View File

@@ -44,21 +44,25 @@ namespace OpenSim.Framework.Serialization.External
/// Deserialize settings
/// </summary>
/// <param name="serializedSettings"></param>
/// <param name="regionEnv"></param>
/// <param name="estateSettings">The Estate Settings stored in the archive will be merged into this object</param>
/// <returns></returns>
/// <exception cref="System.Xml.XmlException"></exception>
public static RegionSettings Deserialize(byte[] serializedSettings, out ViewerEnvironment regionEnv)
public static RegionSettings Deserialize(byte[] serializedSettings, out ViewerEnvironment regionEnv, EstateSettings estateSettings)
{
// encoding is wrong. old oars seem to be on utf-16
return Deserialize(Encoding.ASCII.GetString(serializedSettings, 0, serializedSettings.Length), out regionEnv);
return Deserialize(Encoding.ASCII.GetString(serializedSettings, 0, serializedSettings.Length), out regionEnv, estateSettings);
}
/// <summary>
/// Deserialize settings
/// </summary>
/// <param name="serializedSettings"></param>
/// <param name="regionEnv"></param>
/// <param name="estateSettings">The Estate Settings stored in the archive will be merged into this object</param>
/// <returns></returns>
/// <exception cref="System.Xml.XmlException"></exception>
public static RegionSettings Deserialize(string serializedSettings, out ViewerEnvironment regionEnv)
public static RegionSettings Deserialize(string serializedSettings, out ViewerEnvironment regionEnv, EstateSettings estateSettings)
{
RegionSettings settings = new RegionSettings();
regionEnv = null;
@@ -237,13 +241,36 @@ namespace OpenSim.Framework.Serialization.External
}
}
if (xtr.IsStartElement("Estate"))
{
if (xtr.IsEmptyElement)
xtr.Read();
else
{
xtr.ReadStartElement("Estate");
while (xtr.Read() && xtr.NodeType != XmlNodeType.EndElement)
{
switch (xtr.Name)
{
case "AllowDirectTeleport":
estateSettings.AllowDirectTeleport = bool.Parse(xtr.ReadElementContentAsString());
break;
case "AllowEnvironmentOverride":
estateSettings.AllowEnvironmentOverride = bool.Parse(xtr.ReadElementContentAsString());
break;
}
}
xtr.ReadEndElement();
}
}
xtr.Close();
sr.Close();
return settings;
}
public static string Serialize(RegionSettings settings, ViewerEnvironment RegionEnv)
public static string Serialize(RegionSettings settings, ViewerEnvironment RegionEnv, EstateSettings estateSettings)
{
StringWriter sw = new StringWriter();
XmlTextWriter xtw = new XmlTextWriter(sw);
@@ -308,6 +335,11 @@ namespace OpenSim.Framework.Serialization.External
xtw.WriteEndElement();
}
xtw.WriteStartElement("Estate");
xtw.WriteElementString("AllowDirectTeleport", estateSettings.AllowDirectTeleport.ToString());
xtw.WriteElementString("AllowEnvironmentOverride", estateSettings.AllowEnvironmentOverride.ToString());
xtw.WriteEndElement();
xtw.WriteEndElement();
xtw.Close();

2
OpenSim/Framework/Serialization/Tests/RegionSettingsSerializerTests.cs
View File

@@ -130,7 +130,7 @@ namespace OpenSim.Framework.Serialization.Tests
TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure();
RegionSettings deserRs = RegionSettingsSerializer.Deserialize(m_serializedRs, out ViewerEnvironment dummy);
RegionSettings deserRs = RegionSettingsSerializer.Deserialize(m_serializedRs, out ViewerEnvironment dummy, new EstateSettings());
Assert.That(deserRs, Is.Not.Null);
Assert.That(deserRs.TerrainTexture2, Is.EqualTo(m_rs.TerrainTexture2));
Assert.That(deserRs.DisablePhysics, Is.EqualTo(m_rs.DisablePhysics));

4
OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
View File

@@ -1044,7 +1044,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
ViewerEnvironment regionEnv = null;
try
{
loadedRegionSettings = RegionSettingsSerializer.Deserialize(data, out regionEnv);
loadedRegionSettings = RegionSettingsSerializer.Deserialize(data, out regionEnv, scene.RegionInfo.EstateSettings);
}
catch (Exception e)
{
@@ -1104,6 +1104,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
currentRegionSettings.CacheID = UUID.Random();
currentRegionSettings.Save();
scene.EstateDataService.StoreEstateSettings(scene.RegionInfo.EstateSettings);
IEstateModule estateModule = scene.RequestModuleInterface<IEstateModule>();
if (estateModule != null)
estateModule.sendRegionHandshakeToAll();

2
OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs
View File

@@ -579,7 +579,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
// Write out region settings
string settingsPath = String.Format("{0}{1}{2}.xml",
regionDir, ArchiveConstants.SETTINGS_PATH, scene.RegionInfo.RegionName);
m_archiveWriter.WriteFile(settingsPath, RegionSettingsSerializer.Serialize(scene.RegionInfo.RegionSettings, scene.RegionEnvironment));
m_archiveWriter.WriteFile(settingsPath, RegionSettingsSerializer.Serialize(scene.RegionInfo.RegionSettings, scene.RegionEnvironment, scene.RegionInfo.EstateSettings));
m_log.InfoFormat("[ARCHIVER]: Adding parcel settings to archive.");

2
OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
View File

@@ -657,7 +657,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
rs.TelehubObject = UUID.Parse("00000000-0000-0000-0000-111111111111");
rs.AddSpawnPoint(SpawnPoint.Parse("1,-2,0.33"));
tar.WriteFile(ArchiveConstants.SETTINGS_PATH + "region1.xml", RegionSettingsSerializer.Serialize(rs, null));
tar.WriteFile(ArchiveConstants.SETTINGS_PATH + "region1.xml", RegionSettingsSerializer.Serialize(rs, null, new EstateSettings()));
tar.Close();