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/ScriptEngine | |
parent | remove some tabs added to config files (diff) | |
download | opensim-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 '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs | 1 | ||||
-rwxr-xr-x | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs index bcdc7bf..cfe21fc 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs | |||
@@ -207,6 +207,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
207 | public static void Deserialize(string xml, ScriptInstance instance) | 207 | public static void Deserialize(string xml, ScriptInstance instance) |
208 | { | 208 | { |
209 | XmlDocument doc = new XmlDocument(); | 209 | XmlDocument doc = new XmlDocument(); |
210 | doc.XmlResolver=null; | ||
210 | 211 | ||
211 | Dictionary<string, object> vars = instance.GetVars(); | 212 | Dictionary<string, object> vars = instance.GetVars(); |
212 | 213 | ||
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 65ce61d..05124fc 100755 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
@@ -2098,6 +2098,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
2098 | string xml = instance.GetXMLState(); | 2098 | string xml = instance.GetXMLState(); |
2099 | 2099 | ||
2100 | XmlDocument sdoc = new XmlDocument(); | 2100 | XmlDocument sdoc = new XmlDocument(); |
2101 | sdoc.XmlResolver=null; | ||
2101 | bool loadedState = true; | 2102 | bool loadedState = true; |
2102 | try | 2103 | try |
2103 | { | 2104 | { |
@@ -2253,6 +2254,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
2253 | return false; | 2254 | return false; |
2254 | 2255 | ||
2255 | XmlDocument doc = new XmlDocument(); | 2256 | XmlDocument doc = new XmlDocument(); |
2257 | doc.XmlResolver=null; | ||
2256 | 2258 | ||
2257 | try | 2259 | try |
2258 | { | 2260 | { |