aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorUbitUmarov2018-01-04 23:51:43 +0000
committerUbitUmarov2018-01-04 23:51:43 +0000
commitec6f87d3eff699ca28214629d360c15e5df13156 (patch)
tree2b8678326fa60f63592bfb272c07d0809276e6d9 /OpenSim/Framework
parentremove some tabs added to config files (diff)
downloadopensim-SC_OLD-ec6f87d3eff699ca28214629d360c15e5df13156.zip
opensim-SC_OLD-ec6f87d3eff699ca28214629d360c15e5df13156.tar.gz
opensim-SC_OLD-ec6f87d3eff699ca28214629d360c15e5df13156.tar.bz2
opensim-SC_OLD-ec6f87d3eff699ca28214629d360c15e5df13156.tar.xz
disable some XmlResolver
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs1
-rw-r--r--OpenSim/Framework/Util.cs1
2 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs b/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs
index 1523fa9..d2ca049 100644
--- a/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs
+++ b/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs
@@ -156,6 +156,7 @@ namespace OpenSim.Framework.Serialization.External
156 return xml; 156 return xml;
157 157
158 XmlDocument doc = new XmlDocument(); 158 XmlDocument doc = new XmlDocument();
159 doc.XmlResolver=null;
159 doc.LoadXml(xml); 160 doc.LoadXml(xml);
160 XmlNodeList sops = doc.GetElementsByTagName("SceneObjectPart"); 161 XmlNodeList sops = doc.GetElementsByTagName("SceneObjectPart");
161 162
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index a42dcc6..7093010 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -671,6 +671,7 @@ namespace OpenSim.Framework
671 public static string GetFormattedXml(string rawXml) 671 public static string GetFormattedXml(string rawXml)
672 { 672 {
673 XmlDocument xd = new XmlDocument(); 673 XmlDocument xd = new XmlDocument();
674 xd.XmlResolver=null;
674 xd.LoadXml(rawXml); 675 xd.LoadXml(rawXml);
675 676
676 StringBuilder sb = new StringBuilder(); 677 StringBuilder sb = new StringBuilder();