Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim

1 files changed, 9 insertions, 0 deletions

diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
index 53145e2..eb807f2 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
@@ -73,6 +73,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
                     if (!source.Configs["MRM"].GetBoolean("Hidden", false))
                     {
                         scene.EventManager.OnRezScript += EventManager_OnRezScript;
+                        scene.EventManager.OnStopScript += EventManager_OnStopScript;
                     }
                     
                     scene.EventManager.OnFrame += EventManager_OnFrame;
@@ -90,6 +91,14 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
             }
         }
 
+        void EventManager_OnStopScript(uint localID, UUID itemID)
+        {
+            if(m_scripts.ContainsKey(itemID))
+            {
+                m_scripts[itemID].Stop();
+            }
+        }
+
         void EventManager_OnFrame()
         {
             m_microthreads.Tick(1000);