From 901b9365babdca9b105ff7e9087dfd5d23d99fab Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Thu, 5 Jun 2008 14:31:07 +0000 Subject: [PATCH] * Applied 9085B_[5004]_xengine_abort_regression.patch from #1437 Thank you, Melanie. And Thank you ckrinke. Bigups! --- OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 2b78df3e44..2848441d96 100644 --- 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)