* Applied 9085B_[5004]_xengine_abort_regression.patch from #1437

Thank you, Melanie. And Thank you ckrinke. Bigups!
2008-06-05 14:31:07 +00:00 · 2008-06-05 14:31:07 +00:00 · 901b9365ba
parent 3b764dd34f
commit 901b9365ba
1 changed files with 2 additions and 0 deletions
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@ -933,6 +933,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
            if(result == null)
                return true;

+            result.Abort();
+
            if(SmartThreadPool.WaitAll(new IWorkItemResult[] {result}, new TimeSpan((long)10000000), false))
            {
                lock(m_EventQueue)