Merge commit 'ee84c0589ccca1e7f3216ca1395c3002b773f30f' into bigmerge

Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2011-10-25 01:50:55 +01:00 · 2011-10-25 01:50:55 +01:00 · 69b480770a
parent b4395143e7 ee84c0589c
commit 69b480770a
1 changed files with 5 additions and 0 deletions
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@ -337,6 +337,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine

        public void RemoveRegion(Scene scene)
        {
+            if (!m_Enabled)
+                return;
            lockScriptsForRead(true);
            foreach (IScriptInstance instance in m_Scripts.Values)
            {
@ -418,6 +420,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine

        public void Close()
        {
+            if (!m_Enabled)
+                return;
+            
            lock (m_ScriptEngines)
            {
                if (m_ScriptEngines.Contains(this))