aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorUbitUmarov2018-01-17 07:17:24 +0000
committerUbitUmarov2018-01-17 07:17:24 +0000
commit707eb8de8284c1f3e27565a0dff99ed1563b42ee (patch)
tree84b47088d5756800c2e1eb29f27f9030aa16398a /OpenSim/Region/CoreModules
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 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/HGAssetMapperTests.cs1
-rw-r--r--OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs1
2 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/HGAssetMapperTests.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/HGAssetMapperTests.cs
index 01c5d3b..8f12331 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/HGAssetMapperTests.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/HGAssetMapperTests.cs
@@ -93,7 +93,6 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests
93 Assert.AreEqual(foreignUrl, ncAssetGet.CreatorID); 93 Assert.AreEqual(foreignUrl, ncAssetGet.CreatorID);
94 string xmlData = Utils.BytesToString(ncAssetGet.Data); 94 string xmlData = Utils.BytesToString(ncAssetGet.Data);
95 XmlDocument ncAssetGetXmlDoc = new XmlDocument(); 95 XmlDocument ncAssetGetXmlDoc = new XmlDocument();
96 ncAssetGetXmlDoc.XmlResolver=null;
97 ncAssetGetXmlDoc.LoadXml(xmlData); 96 ncAssetGetXmlDoc.LoadXml(xmlData);
98 97
99// Console.WriteLine(ncAssetGetXmlDoc.OuterXml); 98// Console.WriteLine(ncAssetGetXmlDoc.OuterXml);
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs b/OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs
index 52a80d6..0d84a1f 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs
@@ -69,7 +69,6 @@ namespace OpenSim.Region.CoreModules.World.Serialiser
69 MemoryStream stream = new MemoryStream(); 69 MemoryStream stream = new MemoryStream();
70 XmlTextWriter formatter = new XmlTextWriter(stream, Encoding.UTF8); 70 XmlTextWriter formatter = new XmlTextWriter(stream, Encoding.UTF8);
71 XmlDocument doc = new XmlDocument(); 71 XmlDocument doc = new XmlDocument();
72 doc.XmlResolver=null;
73 doc.LoadXml(xmlstream); 72 doc.LoadXml(xmlstream);
74 formatter.Formatting = Formatting.Indented; 73 formatter.Formatting = Formatting.Indented;
75 doc.WriteContentTo(formatter); 74 doc.WriteContentTo(formatter);