aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Serialiser
diff options
context:
space:
mode:
authorUbitUmarov2018-01-08 12:00:21 +0000
committerUbitUmarov2018-01-08 12:00:21 +0000
commiteec3921800e3a19f210c0488d78399c210f9b9d6 (patch)
tree9d1f1dfc98e518e060b5d172891051edae8c9561 /OpenSim/Region/CoreModules/World/Serialiser
parent a few more xml things (diff)
downloadopensim-SC_OLD-eec3921800e3a19f210c0488d78399c210f9b9d6.zip
opensim-SC_OLD-eec3921800e3a19f210c0488d78399c210f9b9d6.tar.gz
opensim-SC_OLD-eec3921800e3a19f210c0488d78399c210f9b9d6.tar.bz2
opensim-SC_OLD-eec3921800e3a19f210c0488d78399c210f9b9d6.tar.xz
fall back to a obsolete property since several monos in use (include our own) do not suporte the proper .net4.0 one
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Serialiser')
-rw-r--r--OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
index c9e3141..8ac4de1 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
@@ -720,6 +720,8 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
720 string xml = SceneObjectSerializer.ToOriginalXmlFormat(so); 720 string xml = SceneObjectSerializer.ToOriginalXmlFormat(so);
721 721
722 XmlTextReader xtr = new XmlTextReader(new StringReader(xml)); 722 XmlTextReader xtr = new XmlTextReader(new StringReader(xml));
723 xtr.ProhibitDtd = true;
724 xtr.XmlResolver = null;
723 xtr.ReadStartElement("SceneObjectGroup"); 725 xtr.ReadStartElement("SceneObjectGroup");
724 xtr.ReadStartElement("RootPart"); 726 xtr.ReadStartElement("RootPart");
725 xtr.ReadStartElement("SceneObjectPart"); 727 xtr.ReadStartElement("SceneObjectPart");
@@ -831,6 +833,8 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
831 string xml2 = m_serialiserModule.SerializeGroupToXml2(so, options); 833 string xml2 = m_serialiserModule.SerializeGroupToXml2(so, options);
832 834
833 XmlTextReader xtr = new XmlTextReader(new StringReader(xml2)); 835 XmlTextReader xtr = new XmlTextReader(new StringReader(xml2));
836 xtr.ProhibitDtd = true;
837 xtr.XmlResolver = null;
834 xtr.ReadStartElement("SceneObjectGroup"); 838 xtr.ReadStartElement("SceneObjectGroup");
835 xtr.ReadStartElement("SceneObjectPart"); 839 xtr.ReadStartElement("SceneObjectPart");
836 840