diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index b3303a0..e6e0354 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 | |||
2389 | { | 2389 | { |
2390 | using (XmlTextReader wrappedReader = new XmlTextReader(xmlData, XmlNodeType.Element, null)) | 2390 | using (XmlTextReader wrappedReader = new XmlTextReader(xmlData, XmlNodeType.Element, null)) |
2391 | { | 2391 | { |
2392 | using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, ProhibitDtd = true })) | 2392 | using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment})) |
2393 | { | 2393 | { |
2394 | reader.Read(); | 2394 | reader.Read(); |
2395 | bool isSingleObject = reader.Name != "CoalescedObject"; | 2395 | bool isSingleObject = reader.Name != "CoalescedObject"; |
@@ -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; |