From 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb Mon Sep 17 00:00:00 2001
From: onefang
Date: Sun, 19 May 2019 21:24:15 +1000
Subject: Dump OpenSim 0.9.0.1 into it's own branch.
---
.../World/Serialiser/SerialiseObjects.cs | 2 +-
.../World/Serialiser/SerialiserModule.cs | 10 ++++----
.../World/Serialiser/Tests/SerialiserTests.cs | 28 ++++++++++++----------
3 files changed, 22 insertions(+), 18 deletions(-)
(limited to 'OpenSim/Region/CoreModules/World/Serialiser')
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs b/OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs
index 65f464a..52a80d6 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs
@@ -69,7 +69,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser
MemoryStream stream = new MemoryStream();
XmlTextWriter formatter = new XmlTextWriter(stream, Encoding.UTF8);
XmlDocument doc = new XmlDocument();
-
+ doc.XmlResolver=null;
doc.LoadXml(xmlstream);
formatter.Formatting = Formatting.Indented;
doc.WriteContentTo(formatter);
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs b/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs
index e0247d9..c9bc335 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "SerialiserModule")]
public class SerialiserModule : ISharedRegionModule, IRegionSerialiserModule
{
- private static readonly ILog m_log =
+ private static readonly ILog m_log =
LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
// private Commander m_commander = new Commander("export");
@@ -55,15 +55,15 @@ namespace OpenSim.Region.CoreModules.World.Serialiser
#region ISharedRegionModule Members
- public Type ReplaceableInterface
- {
+ public Type ReplaceableInterface
+ {
get { return null; }
}
public void Initialise(IConfigSource source)
{
IConfig config = source.Configs["Serialiser"];
- if (config != null)
+ if (config != null)
{
m_savedir = config.GetString("save_dir", m_savedir);
}
@@ -150,7 +150,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser
{
SceneXmlLoader.SavePrimsToXml2(scene, stream, min, max);
}
-
+
public void SaveNamedPrimsToXml2(Scene scene, string primName, string fileName)
{
SceneXmlLoader.SaveNamedPrimsToXml2(scene, primName, fileName);
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
index a5bb1a7..23475a1 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
[TestFixture]
public class SerialiserTests : OpenSimTestCase
{
- private const string ObjectRootPartStubXml =
+ private const string ObjectRootPartStubXml =
@"
@@ -149,9 +149,9 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
";
- private const string ObjectWithNoOtherPartsXml = ObjectRootPartStubXml +
+ private const string ObjectWithNoOtherPartsXml = ObjectRootPartStubXml +
@"
";
- private const string ObjectWithOtherPartsXml = ObjectRootPartStubXml +
+ private const string ObjectWithOtherPartsXml = ObjectRootPartStubXml +
@"
@@ -574,9 +574,9 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
MyNamespace
-
+
MyStore
-
+
last words
Rosebud
@@ -636,7 +636,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
Assert.That(part.Name, Is.EqualTo("PrimMyRide"));
OSDMap store = part.DynAttrs.GetStore("MyNamespace", "MyStore");
Assert.AreEqual(42, store["the answer"].AsInteger());
- }
+ }
{
SceneObjectPart part = parts[1];
@@ -720,10 +720,12 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
string xml = SceneObjectSerializer.ToOriginalXmlFormat(so);
XmlTextReader xtr = new XmlTextReader(new StringReader(xml));
+ xtr.ProhibitDtd = true;
+
xtr.ReadStartElement("SceneObjectGroup");
xtr.ReadStartElement("RootPart");
xtr.ReadStartElement("SceneObjectPart");
-
+
UUID uuid = UUID.Zero;
string name = null;
UUID creatorId = UUID.Zero;
@@ -733,7 +735,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
{
if (xtr.NodeType != XmlNodeType.Element)
continue;
-
+
switch (xtr.Name)
{
case "UUID":
@@ -831,9 +833,11 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
string xml2 = m_serialiserModule.SerializeGroupToXml2(so, options);
XmlTextReader xtr = new XmlTextReader(new StringReader(xml2));
+ xtr.ProhibitDtd = true;
+
xtr.ReadStartElement("SceneObjectGroup");
xtr.ReadStartElement("SceneObjectPart");
-
+
UUID uuid = UUID.Zero;
string name = null;
UUID creatorId = UUID.Zero;
@@ -843,7 +847,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
{
if (xtr.NodeType != XmlNodeType.Element)
continue;
-
+
switch (xtr.Name)
{
case "UUID":
--
cgit v1.1