aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/XEngine
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-01-16 01:45:09 +0000
committerJustin Clark-Casey (justincc)2013-01-16 01:45:09 +0000
commitb8949024bc55c62b9268b35d4f2a568760b9d7d3 (patch)
tree7b8d984c957fab7aba5aceec66967adb5e8a0d51 /OpenSim/Region/ScriptEngine/XEngine
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-b8949024bc55c62b9268b35d4f2a568760b9d7d3.zip
opensim-SC_OLD-b8949024bc55c62b9268b35d4f2a568760b9d7d3.tar.gz
opensim-SC_OLD-b8949024bc55c62b9268b35d4f2a568760b9d7d3.tar.bz2
opensim-SC_OLD-b8949024bc55c62b9268b35d4f2a568760b9d7d3.tar.xz
Revert "Implement co-operative script termination if termination comes during a script wait event (llSleep(), etc.)"
Doing this as a favour to Melanie. This will be back with passing the wait handles directly to the api. This reverts commit 1b5c41c14ad11325be249ea1cce3c65d4d6a89be.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs5
1 files changed, 0 insertions, 5 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index a17a018..186ae04 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -1716,14 +1716,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1716 IScriptInstance instance = GetInstance(itemID); 1716 IScriptInstance instance = GetInstance(itemID);
1717 1717
1718 if (instance != null) 1718 if (instance != null)
1719 {
1720 instance.Stop(m_WaitForEventCompletionOnScriptStop); 1719 instance.Stop(m_WaitForEventCompletionOnScriptStop);
1721 }
1722 else 1720 else
1723 {
1724// m_log.DebugFormat("[XENGINE]: Could not find script with ID {0} to stop in {1}", itemID, World.Name);
1725 m_runFlags.AddOrUpdate(itemID, false, 240); 1721 m_runFlags.AddOrUpdate(itemID, false, 240);
1726 }
1727 } 1722 }
1728 1723
1729 public DetectParams GetDetectParams(UUID itemID, int idx) 1724 public DetectParams GetDetectParams(UUID itemID, int idx)