diff options
| author | UbitUmarov | 2018-01-05 22:37:42 +0000 |
|---|---|---|
| committer | UbitUmarov | 2018-01-05 22:37:42 +0000 |
| commit | 875ca104b85dbf48fc0e5035dc2c01b10a61f8e9 (patch) | |
| tree | 5a48cbd483b57c88d5be9c012e8f28422f3e368f /OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | a few more xml things (diff) | |
| download | opensim-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/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs | 1 |
1 files changed, 1 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 | ||