aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Capabilities
diff options
context:
space:
mode:
authorUbitUmarov2018-01-05 22:37:42 +0000
committerUbitUmarov2018-01-05 22:37:42 +0000
commit875ca104b85dbf48fc0e5035dc2c01b10a61f8e9 (patch)
tree5a48cbd483b57c88d5be9c012e8f28422f3e368f /OpenSim/Capabilities
parentMerge branch 'master' into httptests (diff)
parent a few more xml things (diff)
downloadopensim-SC-875ca104b85dbf48fc0e5035dc2c01b10a61f8e9.zip
opensim-SC-875ca104b85dbf48fc0e5035dc2c01b10a61f8e9.tar.gz
opensim-SC-875ca104b85dbf48fc0e5035dc2c01b10a61f8e9.tar.bz2
opensim-SC-875ca104b85dbf48fc0e5035dc2c01b10a61f8e9.tar.xz
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Capabilities')
-rw-r--r--OpenSim/Capabilities/LLSD.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Capabilities/LLSD.cs b/OpenSim/Capabilities/LLSD.cs
index 76e439f..5ed312c 100644
--- a/OpenSim/Capabilities/LLSD.cs
+++ b/OpenSim/Capabilities/LLSD.cs
@@ -83,6 +83,9 @@ namespace OpenSim.Framework.Capabilities
83 { 83 {
84 using (XmlTextReader reader = new XmlTextReader(st)) 84 using (XmlTextReader reader = new XmlTextReader(st))
85 { 85 {
86 reader.DtdProcessing = DtdProcessing.Prohibit;
87 reader.XmlResolver = null;
88
86 reader.Read(); 89 reader.Read();
87 SkipWS(reader); 90 SkipWS(reader);
88 91