Merge branch 'master' into httptests

This commit is contained in:
UbitUmarov
2018-01-05 22:37:42 +00:00
46 changed files with 936 additions and 178 deletions

View File

@@ -207,6 +207,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
public static void Deserialize(string xml, ScriptInstance instance)
{
XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
Dictionary<string, object> vars = instance.GetVars();