aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Serialization
diff options
context:
space:
mode:
authorUbitUmarov2018-01-08 12:00:21 +0000
committerUbitUmarov2018-01-08 12:00:21 +0000
commiteec3921800e3a19f210c0488d78399c210f9b9d6 (patch)
tree9d1f1dfc98e518e060b5d172891051edae8c9561 /OpenSim/Region/Framework/Scenes/Serialization
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/Framework/Scenes/Serialization')
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs2
3 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
index c3bc4a0..abcd440 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
@@ -133,7 +133,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
133 { 133 {
134 using (XmlTextReader reader = new XmlTextReader(sr)) 134 using (XmlTextReader reader = new XmlTextReader(sr))
135 { 135 {
136 reader.DtdProcessing = DtdProcessing.Prohibit; 136 reader.ProhibitDtd = true;
137 reader.XmlResolver = null; 137 reader.XmlResolver = null;
138 138
139 reader.MoveToContent(); // skip possible xml declaration 139 reader.MoveToContent(); // skip possible xml declaration
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index a2d512a..2d8f3cd 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
63 String fixedData = ExternalRepresentationUtils.SanitizeXml(xmlData); 63 String fixedData = ExternalRepresentationUtils.SanitizeXml(xmlData);
64 using (XmlTextReader wrappedReader = new XmlTextReader(fixedData, XmlNodeType.Element, null)) 64 using (XmlTextReader wrappedReader = new XmlTextReader(fixedData, XmlNodeType.Element, null))
65 { 65 {
66 using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, DtdProcessing = DtdProcessing.Prohibit, XmlResolver = null })) 66 using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, ProhibitDtd = true, XmlResolver = null }))
67 { 67 {
68 try 68 try
69 { 69 {
@@ -272,7 +272,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
272 { 272 {
273 using(XmlTextReader reader = new XmlTextReader(sr)) 273 using(XmlTextReader reader = new XmlTextReader(sr))
274 { 274 {
275 reader.DtdProcessing = DtdProcessing.Prohibit; 275 reader.ProhibitDtd = true;
276 reader.XmlResolver = null; 276 reader.XmlResolver = null;
277 277
278 sceneObject = new SceneObjectGroup(SceneObjectPart.FromXml(reader)); 278 sceneObject = new SceneObjectGroup(SceneObjectPart.FromXml(reader));
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs
index 977dd73..e486580 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs
@@ -57,7 +57,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
57 using(XmlTextReader reader = new XmlTextReader(fileName)) 57 using(XmlTextReader reader = new XmlTextReader(fileName))
58 { 58 {
59 reader.WhitespaceHandling = WhitespaceHandling.None; 59 reader.WhitespaceHandling = WhitespaceHandling.None;
60 reader.DtdProcessing = DtdProcessing.Prohibit; 60 reader.ProhibitDtd = true;
61 reader.XmlResolver = null; 61 reader.XmlResolver = null;
62 62
63 doc.Load(reader); 63 doc.Load(reader);