aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/XEngine
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-12-17 21:37:02 +0000
committerJustin Clark-Casey (justincc)2012-12-17 21:37:02 +0000
commite6fd8365af0b0dc7a4664278c369752cb4e87155 (patch)
tree194233d93d9518ffc3ee1419e7ed6859cba72d77 /OpenSim/Region/ScriptEngine/XEngine
parentBulletSim: fix vehicles being shot in the air at border crossings because of ... (diff)
downloadopensim-SC-e6fd8365af0b0dc7a4664278c369752cb4e87155.zip
opensim-SC-e6fd8365af0b0dc7a4664278c369752cb4e87155.tar.gz
opensim-SC-e6fd8365af0b0dc7a4664278c369752cb4e87155.tar.bz2
opensim-SC-e6fd8365af0b0dc7a4664278c369752cb4e87155.tar.xz
Extend default 1 second wait for event completion to other thread script reset (as called by llResetOtherScript()).
As with script stop (via llDie()) aborting other scripts event threads, llResetOtherScript() can also abort any current event thread on another script. On mono 2.6, 2.10 and possibly later this may cause locking problems in certain code areas. This commit reuses the recently introduced [XEngine] WaitForEventCompletionOnScriptStop to make this a 1 sec timeout, rather than 0 secs.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 1dd50c7..f38d17d 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -1691,7 +1691,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1691 { 1691 {
1692 IScriptInstance instance = GetInstance(itemID); 1692 IScriptInstance instance = GetInstance(itemID);
1693 if (instance != null) 1693 if (instance != null)
1694 instance.ResetScript(); 1694 instance.ResetScript(m_WaitForEventCompletionOnScriptStop);
1695 } 1695 }
1696 1696
1697 public void StartScript(UUID itemID) 1697 public void StartScript(UUID itemID)