From 707eb8de8284c1f3e27565a0dff99ed1563b42ee Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Wed, 17 Jan 2018 07:17:24 +0000 Subject: remove more xml things no longer needed on .net >4.5.2 --- OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs | 1 - OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'OpenSim/Region/ScriptEngine') diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs index cfe21fc..bcdc7bf 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs @@ -207,7 +207,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance public static void Deserialize(string xml, ScriptInstance instance) { XmlDocument doc = new XmlDocument(); - doc.XmlResolver=null; Dictionary vars = instance.GetVars(); diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 05124fc..c86a50e 100755 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs @@ -2098,7 +2098,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine string xml = instance.GetXMLState(); XmlDocument sdoc = new XmlDocument(); - sdoc.XmlResolver=null; + bool loadedState = true; try { @@ -2254,7 +2254,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine return false; XmlDocument doc = new XmlDocument(); - doc.XmlResolver=null; try { -- cgit v1.1