aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Serialization
diff options
context:
space:
mode:
authorUbitUmarov2018-01-17 07:17:24 +0000
committerUbitUmarov2018-01-17 07:17:24 +0000
commit707eb8de8284c1f3e27565a0dff99ed1563b42ee (patch)
tree84b47088d5756800c2e1eb29f27f9030aa16398a /OpenSim/Region/Framework/Scenes/Serialization
parentpesty warnings (diff)
downloadopensim-SC-707eb8de8284c1f3e27565a0dff99ed1563b42ee.zip
opensim-SC-707eb8de8284c1f3e27565a0dff99ed1563b42ee.tar.gz
opensim-SC-707eb8de8284c1f3e27565a0dff99ed1563b42ee.tar.bz2
opensim-SC-707eb8de8284c1f3e27565a0dff99ed1563b42ee.tar.xz
remove more xml things no longer needed on .net >4.5.2
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs1
3 files changed, 0 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
index a93782e..41f3ef4 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
@@ -147,7 +147,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
147 } 147 }
148 148
149 XmlDocument doc = new XmlDocument(); 149 XmlDocument doc = new XmlDocument();
150 doc.XmlResolver=null;
151 doc.LoadXml(xml); 150 doc.LoadXml(xml);
152 XmlElement e = (XmlElement)doc.SelectSingleNode("/CoalescedObject"); 151 XmlElement e = (XmlElement)doc.SelectSingleNode("/CoalescedObject");
153 if (e == null) 152 if (e == null)
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 1196c28..590a5d4 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -255,7 +255,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
255 try 255 try
256 { 256 {
257 XmlDocument doc = new XmlDocument(); 257 XmlDocument doc = new XmlDocument();
258 doc.XmlResolver=null;
259 doc.LoadXml(xmlData); 258 doc.LoadXml(xmlData);
260 259
261 XmlNodeList parts = doc.GetElementsByTagName("SceneObjectPart"); 260 XmlNodeList parts = doc.GetElementsByTagName("SceneObjectPart");
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs
index 09e3f9c..42381f6 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs
@@ -49,7 +49,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
49 public static void LoadPrimsFromXml(Scene scene, string fileName, bool newIDS, Vector3 loadOffset) 49 public static void LoadPrimsFromXml(Scene scene, string fileName, bool newIDS, Vector3 loadOffset)
50 { 50 {
51 XmlDocument doc = new XmlDocument(); 51 XmlDocument doc = new XmlDocument();
52 doc.XmlResolver=null;
53 XmlNode rootNode; 52 XmlNode rootNode;
54 53
55 if (fileName.StartsWith("http:") || File.Exists(fileName)) 54 if (fileName.StartsWith("http:") || File.Exists(fileName))