aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
authorUbitUmarov2018-01-16 17:17:44 +0000
committerUbitUmarov2018-01-16 17:17:44 +0000
commitb903287dd154204d7d277b9a5fcd01a4933e67a1 (patch)
tree2f23b11df3d832b3631b7415cc6c374b18de2384 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
parentupdate lsl2c tools and parsing files. This may fix some issues with precenden... (diff)
parent do not timeout BackupWorker threads (diff)
downloadopensim-SC-b903287dd154204d7d277b9a5fcd01a4933e67a1.zip
opensim-SC-b903287dd154204d7d277b9a5fcd01a4933e67a1.tar.gz
opensim-SC-b903287dd154204d7d277b9a5fcd01a4933e67a1.tar.bz2
opensim-SC-b903287dd154204d7d277b9a5fcd01a4933e67a1.tar.xz
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 84367df..b3303a0 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, DtdProcessing = DtdProcessing.Prohibit, XmlResolver = null })) 2392 using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, ProhibitDtd = true }))
2393 { 2393 {
2394 reader.Read(); 2394 reader.Read();
2395 bool isSingleObject = reader.Name != "CoalescedObject"; 2395 bool isSingleObject = reader.Name != "CoalescedObject";