diff options
| author | onefang | 2019-09-11 16:36:50 +1000 |
|---|---|---|
| committer | onefang | 2019-09-11 16:36:50 +1000 |
| commit | 50cd1ffd32f69228e566f2b0b89f86ea0d9fe489 (patch) | |
| tree | 52f2ab0c04f1a5d7d6ac5dc872981b4b156447e7 /OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs | |
| parent | Renamed branch to SledjChisl. (diff) | |
| parent | Bump to release flavour, build 0. (diff) | |
| download | opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.zip opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.gz opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.bz2 opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.xz | |
Merge branch 'SledjChisl'
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 | ||