Merge branch 'master' into httptests

3 files changed, 4 insertions, 7 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
index c3bc4a0..abcb573 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
@@ -133,8 +133,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                 {
                     using (XmlTextReader reader = new XmlTextReader(sr))
                     {
-                        reader.DtdProcessing = DtdProcessing.Prohibit;
-                        reader.XmlResolver = null;
+                        reader.ProhibitDtd = true;
 
                         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 66bf536..9a20706 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
             String fixedData = ExternalRepresentationUtils.SanitizeXml(xmlData);
             using (XmlTextReader wrappedReader = new XmlTextReader(fixedData, XmlNodeType.Element, null))
             {
-                using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, DtdProcessing = DtdProcessing.Prohibit, XmlResolver = null }))
+                using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, ProhibitDtd = true }))
                 {
                     try
                     {
@@ -272,8 +272,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                 {
                     using(XmlTextReader reader = new XmlTextReader(sr))
                     {
-                        reader.DtdProcessing = DtdProcessing.Prohibit;
-                        reader.XmlResolver = null;
+                        reader.ProhibitDtd = true;
 
                         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..0ebc645 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs
@@ -57,8 +57,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                 using(XmlTextReader reader = new XmlTextReader(fileName))
                 {
                     reader.WhitespaceHandling = WhitespaceHandling.None;
-                    reader.DtdProcessing = DtdProcessing.Prohibit;
-                    reader.XmlResolver = null;
+                    reader.ProhibitDtd = true;
 
                     doc.Load(reader);
                 }