Don't execute rest of code in XEngine.RemoveRegion() and Close() if the module is disabled.

1 files changed, 6 insertions, 0 deletions

diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index f6afcdb..2a0ec37 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -269,6 +269,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
         public void RemoveRegion(Scene scene)
         {
+            if (!m_Enabled)
+                return;
+
             lock (m_Scripts)
             {
                 m_log.InfoFormat(
@@ -351,6 +354,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
         public void Close()
         {
+            if (!m_Enabled)
+                return;
+            
             lock (m_ScriptEngines)
             {
                 if (m_ScriptEngines.Contains(this))