From f6650d33cc7824329bce84e87e1d1cb5ec592e0b Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Thu, 25 Sep 2008 14:20:31 +0000
Subject: Fixes an exception that is seen on regions running XEngine, where DNE
 tries to stop a script that is not run by it

---
 OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs')

diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
index 9a9eba7..624b20b 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
@@ -169,18 +169,13 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
 
         public override void _StopScript(uint localID, UUID itemID)
         {
-            // Stop script
-//#if DEBUG
-//            m_scriptEngine.Log.Debug("[" + m_scriptEngine.ScriptEngineName + "]: Stop script localID: " + localID + " LLUID: " + itemID.ToString());
-//#endif
-
-            // Stop long command on script
-            AsyncCommandManager.RemoveScript(m_scriptEngine, localID, itemID);
-
             IScript LSLBC = GetScript(localID, itemID);
             if (LSLBC == null)
                 return;
 
+            // Stop long command on script
+            AsyncCommandManager.RemoveScript(m_scriptEngine, localID, itemID);
+
             // TEMP: First serialize it
             //GetSerializedScript(localID, itemID);
 
-- 
cgit v1.1