diff options
author | UbitUmarov | 2018-01-04 23:51:43 +0000 |
---|---|---|
committer | UbitUmarov | 2018-01-04 23:51:43 +0000 |
commit | ec6f87d3eff699ca28214629d360c15e5df13156 (patch) | |
tree | 2b8678326fa60f63592bfb272c07d0809276e6d9 /OpenSim/Region/Framework/Scenes/Serialization | |
parent | remove some tabs added to config files (diff) | |
download | opensim-SC-ec6f87d3eff699ca28214629d360c15e5df13156.zip opensim-SC-ec6f87d3eff699ca28214629d360c15e5df13156.tar.gz opensim-SC-ec6f87d3eff699ca28214629d360c15e5df13156.tar.bz2 opensim-SC-ec6f87d3eff699ca28214629d360c15e5df13156.tar.xz |
disable some XmlResolver
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Serialization')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs index 41f3ef4..a93782e 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs | |||
@@ -147,6 +147,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
147 | } | 147 | } |
148 | 148 | ||
149 | XmlDocument doc = new XmlDocument(); | 149 | XmlDocument doc = new XmlDocument(); |
150 | doc.XmlResolver=null; | ||
150 | doc.LoadXml(xml); | 151 | doc.LoadXml(xml); |
151 | XmlElement e = (XmlElement)doc.SelectSingleNode("/CoalescedObject"); | 152 | XmlElement e = (XmlElement)doc.SelectSingleNode("/CoalescedObject"); |
152 | if (e == null) | 153 | if (e == null) |
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index 82bbe6f..948c345 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |||
@@ -255,6 +255,7 @@ 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; | ||
258 | doc.LoadXml(xmlData); | 259 | doc.LoadXml(xmlData); |
259 | 260 | ||
260 | XmlNodeList parts = doc.GetElementsByTagName("SceneObjectPart"); | 261 | XmlNodeList parts = doc.GetElementsByTagName("SceneObjectPart"); |