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

@@ -455,7 +455,7 @@ namespace OpenSim.Region.Framework.Scenes
if (m_part.ParentGroup.m_savedScriptState.ContainsKey(stateID))
{
XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
doc.LoadXml(m_part.ParentGroup.m_savedScriptState[stateID]);
////////// CRUFT WARNING ///////////////////////////////////