8 files changed, 3 insertions, 9 deletions

diff --git a/OpenSim/Framework/PhysicsInertia.cs b/OpenSim/Framework/PhysicsInertia.cs
index 3a55f8a..fa83de8 100644
--- a/OpenSim/Framework/PhysicsInertia.cs
+++ b/OpenSim/Framework/PhysicsInertia.cs
@@ -194,7 +194,6 @@ namespace OpenSim.Framework
                 using(XmlTextReader xreader = new XmlTextReader(ms))
                 {
                     xreader.ProhibitDtd = true;
-                    xreader.XmlResolver = null;
 
                     v = new PhysicsInertiaData();
                     v.FromXml2(xreader, out error);
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index d071b8c..6e7a038 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -1596,7 +1596,6 @@ namespace OpenSim.Framework
                         using (XmlTextReader xtr = new XmlTextReader(sr))
                         {
                             xtr.ProhibitDtd = true;
-                            xtr.XmlResolver = null;
 
                             xtr.MoveToContent();
 
diff --git a/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs b/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs
index 2d4bdbc..af130a5 100644
--- a/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs
+++ b/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs
@@ -221,7 +221,7 @@ namespace OpenSim.Framework.Serialization.External
             using (StringWriter sw = new StringWriter())
             using (XmlTextWriter writer = new XmlTextWriter(sw))
             using (XmlTextReader wrappedReader = new XmlTextReader(xmlData, XmlNodeType.Element, null))
-            using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, ProhibitDtd = true, XmlResolver = null }))
+            using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, ProhibitDtd = true}))
             {
                 TransformXml(reader, writer, sceneName, homeURL, userService, scopeID);
 
diff --git a/OpenSim/Framework/Serialization/External/LandDataSerializer.cs b/OpenSim/Framework/Serialization/External/LandDataSerializer.cs
index 7e17bc0..33ffd83 100644
--- a/OpenSim/Framework/Serialization/External/LandDataSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/LandDataSerializer.cs
@@ -179,7 +179,6 @@ namespace OpenSim.Framework.Serialization.External
             using (XmlTextReader reader = new XmlTextReader(new StringReader(serializedLandData)))
             {
                 reader.ProhibitDtd = true;
-                reader.XmlResolver = null;
                 reader.ReadStartElement("LandData");
 
                 ExternalRepresentationUtils.ExecuteReadProcessors<LandData>(landData, m_ldProcessors, reader);
diff --git a/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
index 6ff5687..fd21f3e 100644
--- a/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
@@ -64,7 +64,6 @@ namespace OpenSim.Framework.Serialization.External
             StringReader sr = new StringReader(serializedSettings);
             XmlTextReader xtr = new XmlTextReader(sr);
             xtr.ProhibitDtd = true;
-            xtr.XmlResolver = null;
 
             xtr.ReadStartElement("RegionSettings");
 
diff --git a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
index f13bb2c..12194ad 100644
--- a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
@@ -203,7 +203,6 @@ namespace OpenSim.Framework.Serialization.External
             using (XmlTextReader reader = new XmlTextReader(new StringReader(serialization)))
             {
                 reader.ProhibitDtd = true;
-                reader.XmlResolver = null;
 
                 reader.ReadStartElement("InventoryItem");
 
diff --git a/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs b/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs
index 7e2d909..67fc14e 100644
--- a/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs
@@ -55,7 +55,6 @@ namespace OpenSim.Framework.Servers.HttpServer
             using (XmlTextReader xmlReader = new XmlTextReader(request))
             {
                 xmlReader.ProhibitDtd = true;
-                xmlReader.XmlResolver = null;
 
                 XmlSerializer deserializer = new XmlSerializer(typeof (TRequest));
                 deserial = (TRequest) deserializer.Deserialize(xmlReader);
diff --git a/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs b/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
index 1887a13..158befa 100644
--- a/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
+++ b/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
@@ -211,7 +211,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 try
                 {
                     xmlReader.ProhibitDtd = true;
-                    xmlReader.XmlResolver = null;
+
                     XmlSerializer deserializer = new XmlSerializer(typeof(RestSessionObject<TRequest>));
                     deserial = (RestSessionObject<TRequest>)deserializer.Deserialize(xmlReader);
                 }
@@ -272,7 +272,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 try
                 {
                     xmlReader.ProhibitDtd = true;
-                    xmlReader.XmlResolver = null;
+
                     XmlSerializer deserializer = new XmlSerializer(typeof(TRequest));
                     deserial = (TRequest)deserializer.Deserialize(xmlReader);
                 }