diff options
| author | lbsa71 | 2008-06-05 14:31:07 +0000 |
|---|---|---|
| committer | lbsa71 | 2008-06-05 14:31:07 +0000 |
| commit | 901b9365babdca9b105ff7e9087dfd5d23d99fab (patch) | |
| tree | c541aae9a821c340c93490bf8296292e2eb5fdd0 /OpenSim | |
| parent | Mantis#1438. Thank you kindly, Melanie for a patch that: (diff) | |
| download | opensim-SC_OLD-901b9365babdca9b105ff7e9087dfd5d23d99fab.zip opensim-SC_OLD-901b9365babdca9b105ff7e9087dfd5d23d99fab.tar.gz opensim-SC_OLD-901b9365babdca9b105ff7e9087dfd5d23d99fab.tar.bz2 opensim-SC_OLD-901b9365babdca9b105ff7e9087dfd5d23d99fab.tar.xz | |
* Applied 9085B_[5004]_xengine_abort_regression.patch from #1437
Thank you, Melanie. And Thank you ckrinke. Bigups!
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 2b78df3..2848441 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
| @@ -933,6 +933,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
| 933 | if(result == null) | 933 | if(result == null) |
| 934 | return true; | 934 | return true; |
| 935 | 935 | ||
| 936 | result.Abort(); | ||
| 937 | |||
| 936 | if(SmartThreadPool.WaitAll(new IWorkItemResult[] {result}, new TimeSpan((long)10000000), false)) | 938 | if(SmartThreadPool.WaitAll(new IWorkItemResult[] {result}, new TimeSpan((long)10000000), false)) |
| 937 | { | 939 | { |
| 938 | lock(m_EventQueue) | 940 | lock(m_EventQueue) |