diff options
author | UbitUmarov | 2018-01-17 07:17:24 +0000 |
---|---|---|
committer | UbitUmarov | 2018-01-17 07:17:24 +0000 |
commit | 707eb8de8284c1f3e27565a0dff99ed1563b42ee (patch) | |
tree | 84b47088d5756800c2e1eb29f27f9030aa16398a /OpenSim/Region/Framework | |
parent | pesty warnings (diff) | |
download | opensim-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 'OpenSim/Region/Framework')
7 files changed, 0 insertions, 9 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs b/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs index 78f545b..b8db3a9 100644 --- a/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs +++ b/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs | |||
@@ -59,8 +59,6 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
59 | using (XmlTextReader reader = new XmlTextReader(path)) | 59 | using (XmlTextReader reader = new XmlTextReader(path)) |
60 | { | 60 | { |
61 | XmlDocument doc = new XmlDocument(); | 61 | XmlDocument doc = new XmlDocument(); |
62 | doc.XmlResolver = null; | ||
63 | |||
64 | doc.Load(reader); | 62 | doc.Load(reader); |
65 | // if (doc.DocumentElement != null) | 63 | // if (doc.DocumentElement != null) |
66 | // { | 64 | // { |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index e8a8a6e..e6e0354 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -2420,7 +2420,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
2420 | else | 2420 | else |
2421 | { | 2421 | { |
2422 | XmlDocument doc = new XmlDocument(); | 2422 | XmlDocument doc = new XmlDocument(); |
2423 | doc.XmlResolver=null; | ||
2424 | doc.LoadXml(xmlData); | 2423 | doc.LoadXml(xmlData); |
2425 | XmlElement e = (XmlElement)doc.SelectSingleNode("/CoalescedObject"); | 2424 | XmlElement e = (XmlElement)doc.SelectSingleNode("/CoalescedObject"); |
2426 | XmlElement coll = (XmlElement)e; | 2425 | XmlElement coll = (XmlElement)e; |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs index c20c81d..bf217a5 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs | |||
@@ -505,7 +505,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
505 | foreach (KeyValuePair<UUID, string> state in states) | 505 | foreach (KeyValuePair<UUID, string> state in states) |
506 | { | 506 | { |
507 | XmlDocument sdoc = new XmlDocument(); | 507 | XmlDocument sdoc = new XmlDocument(); |
508 | sdoc.XmlResolver=null; | ||
509 | sdoc.LoadXml(state.Value); | 508 | sdoc.LoadXml(state.Value); |
510 | XmlNodeList rootL = sdoc.GetElementsByTagName("State"); | 509 | XmlNodeList rootL = sdoc.GetElementsByTagName("State"); |
511 | XmlNode rootNode = rootL[0]; | 510 | XmlNode rootNode = rootL[0]; |
@@ -541,7 +540,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
541 | return; | 540 | return; |
542 | 541 | ||
543 | XmlDocument doc = new XmlDocument(); | 542 | XmlDocument doc = new XmlDocument(); |
544 | doc.XmlResolver=null; | ||
545 | try | 543 | try |
546 | { | 544 | { |
547 | doc.LoadXml(objXMLData); | 545 | doc.LoadXml(objXMLData); |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 0b8cc7f..4934b83 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
@@ -455,7 +455,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
455 | if (m_part.ParentGroup.m_savedScriptState.ContainsKey(stateID)) | 455 | if (m_part.ParentGroup.m_savedScriptState.ContainsKey(stateID)) |
456 | { | 456 | { |
457 | XmlDocument doc = new XmlDocument(); | 457 | XmlDocument doc = new XmlDocument(); |
458 | doc.XmlResolver=null; | ||
459 | doc.LoadXml(m_part.ParentGroup.m_savedScriptState[stateID]); | 458 | doc.LoadXml(m_part.ParentGroup.m_savedScriptState[stateID]); |
460 | 459 | ||
461 | ////////// CRUFT WARNING /////////////////////////////////// | 460 | ////////// CRUFT WARNING /////////////////////////////////// |
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)) |