OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Thank you, Melanie. And Thank you ckrinke. Bigups!
0.6.0-stable
lbsa71 2008-06-05 14:31:07 +00:00
parent 3b764dd34f
commit 901b9365ba
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
View File

@ -933,6 +933,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
if(result == null) if(result == null)
return true; return true;
result.Abort();
if(SmartThreadPool.WaitAll(new IWorkItemResult[] {result}, new TimeSpan((long)10000000), false)) if(SmartThreadPool.WaitAll(new IWorkItemResult[] {result}, new TimeSpan((long)10000000), false))
{ {
lock(m_EventQueue) lock(m_EventQueue)