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/Framework/Scenes/Animation/DefaultAvatarAnimations.cs | 2 +-
 OpenSim/Region/Framework/Scenes/SOPVehicle.cs                        | 1 -
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs                   | 2 +-
 OpenSim/Region/Framework/Scenes/TerrainChannel.cs                    | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs b/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs
index 77edb4c..2128d58 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
             using (XmlTextReader reader = new XmlTextReader(path))
             {
                 reader.ProhibitDtd = true;
-//                reader.XmlResolver = null;
+
                 XmlDocument doc = new XmlDocument();
                 doc.XmlResolver = null;
 
diff --git a/OpenSim/Region/Framework/Scenes/SOPVehicle.cs b/OpenSim/Region/Framework/Scenes/SOPVehicle.cs
index 0a1923a..6683614 100644
--- a/OpenSim/Region/Framework/Scenes/SOPVehicle.cs
+++ b/OpenSim/Region/Framework/Scenes/SOPVehicle.cs
@@ -594,7 +594,6 @@ namespace OpenSim.Region.Framework.Scenes
             MemoryStream ms = new MemoryStream(enc.GetBytes(text));
             XmlTextReader xreader = new XmlTextReader(ms);
             xreader.ProhibitDtd = true;
-            xreader.XmlResolver = null;
 
             SOPVehicle v = new SOPVehicle();
             bool error;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index a3c7dbc..b3303a0 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2389,7 +2389,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 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 }))
                     {
                         reader.Read();
                         bool isSingleObject = reader.Name != "CoalescedObject";
diff --git a/OpenSim/Region/Framework/Scenes/TerrainChannel.cs b/OpenSim/Region/Framework/Scenes/TerrainChannel.cs
index 6ebe897..20bad94 100644
--- a/OpenSim/Region/Framework/Scenes/TerrainChannel.cs
+++ b/OpenSim/Region/Framework/Scenes/TerrainChannel.cs
@@ -201,7 +201,7 @@ namespace OpenSim.Region.Framework.Scenes
                 using(XmlTextReader reader = new XmlTextReader(sr))
                 {
                     reader.ProhibitDtd = true;
-                    reader.XmlResolver = null;
+
                     ReadXml(reader);
                 }
             }
-- 
cgit v1.1