aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2018-01-09 19:48:13 +0000
committerUbitUmarov2018-01-09 19:48:13 +0000
commit439cbf0d4d4c2402729f0d73c6bbc2bf969a5f9a (patch)
tree884accea17684b6af5019505f29c3323dba3d0c6
parentgive up on a property that old monos do compile, but then smore ok exec (diff)
downloadopensim-SC-439cbf0d4d4c2402729f0d73c6bbc2bf969a5f9a.zip
opensim-SC-439cbf0d4d4c2402729f0d73c6bbc2bf969a5f9a.tar.gz
opensim-SC-439cbf0d4d4c2402729f0d73c6bbc2bf969a5f9a.tar.bz2
opensim-SC-439cbf0d4d4c2402729f0d73c6bbc2bf969a5f9a.tar.xz
missed a few..
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs3
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs1
3 files changed, 1 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
index abcd440..abcb573 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
@@ -134,7 +134,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
134 using (XmlTextReader reader = new XmlTextReader(sr)) 134 using (XmlTextReader reader = new XmlTextReader(sr))
135 { 135 {
136 reader.ProhibitDtd = true; 136 reader.ProhibitDtd = true;
137 reader.XmlResolver = null;
138 137
139 reader.MoveToContent(); // skip possible xml declaration 138 reader.MoveToContent(); // skip possible xml declaration
140 139
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 2d8f3cd..c5a3a22 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, ProhibitDtd = true, XmlResolver = null })) 66 using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, ProhibitDtd = true }))
67 { 67 {
68 try 68 try
69 { 69 {
@@ -273,7 +273,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
273 using(XmlTextReader reader = new XmlTextReader(sr)) 273 using(XmlTextReader reader = new XmlTextReader(sr))
274 { 274 {
275 reader.ProhibitDtd = true; 275 reader.ProhibitDtd = true;
276 reader.XmlResolver = null;
277 276
278 sceneObject = new SceneObjectGroup(SceneObjectPart.FromXml(reader)); 277 sceneObject = new SceneObjectGroup(SceneObjectPart.FromXml(reader));
279 } 278 }
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs
index e486580..0ebc645 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs
@@ -58,7 +58,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
58 { 58 {
59 reader.WhitespaceHandling = WhitespaceHandling.None; 59 reader.WhitespaceHandling = WhitespaceHandling.None;
60 reader.ProhibitDtd = true; 60 reader.ProhibitDtd = true;
61 reader.XmlResolver = null;
62 61
63 doc.Load(reader); 62 doc.Load(reader);
64 } 63 }