Merge commit 'ee84c0589ccca1e7f3216ca1395c3002b773f30f' into bigmerge

Conflicts:
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs

1 files changed, 5 insertions, 0 deletions

diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index c437703..32d1fd3 100644
--- 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))