From e908c0ecadb9d44102ee649c5f9184e6e3034541 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Tue, 9 Jan 2018 19:47:10 +0000
Subject: give up on a property that old monos do compile, but then smore ok
 exec

---
 OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs      | 2 +-
 OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs      | 1 -
 OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs        | 1 -
 OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs | 4 ++--
 4 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Region/CoreModules')

diff --git a/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs b/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs
index eb3c115..61e461a 100644
--- a/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs
@@ -125,7 +125,7 @@ namespace OpenSim.Region.CoreModules.Avatar.BakedTextures
                         using(XmlTextReader sr = new XmlTextReader(s))
                         {
                             sr.ProhibitDtd = true;
-                            sr.XmlResolver = null;
+
                             sr.ReadStartElement("BakedAppearance");
                             while(sr.LocalName == "BakedTexture")
                             {
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index 78abaed..41515c0 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -1131,7 +1131,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             XmlParserContext context = new XmlParserContext(null, nsmgr, null, XmlSpace.None);
             XmlTextReader xtr = new XmlTextReader(Encoding.ASCII.GetString(data), XmlNodeType.Document, context);
             xtr.ProhibitDtd = true;
-            xtr.XmlResolver = null;
 
             // Loaded metadata will be empty if no information exists in the archive
             dearchivedScenes.LoadedCreationDateTime = 0;
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs
index 9a19ad9..5d3be62 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs
@@ -94,7 +94,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             StringReader sr = new StringReader(xml);
             XmlTextReader reader = new XmlTextReader(sr);
             reader.ProhibitDtd = true;
-            reader.XmlResolver = null;
 
             reader.ReadStartElement("assets");
             reader.Read();
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
index 8ac4de1..23475a1 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
@@ -721,7 +721,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
 
             XmlTextReader xtr = new XmlTextReader(new StringReader(xml));
             xtr.ProhibitDtd = true;
-            xtr.XmlResolver = null;
+
             xtr.ReadStartElement("SceneObjectGroup");
             xtr.ReadStartElement("RootPart");
             xtr.ReadStartElement("SceneObjectPart");
@@ -834,7 +834,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
 
             XmlTextReader xtr = new XmlTextReader(new StringReader(xml2));
             xtr.ProhibitDtd = true;
-            xtr.XmlResolver = null;
+
             xtr.ReadStartElement("SceneObjectGroup");
             xtr.ReadStartElement("SceneObjectPart");
 
-- 
cgit v1.1