diff options
| author | Melanie | 2010-06-02 17:14:37 +0100 |
|---|---|---|
| committer | Melanie | 2010-06-02 17:14:37 +0100 |
| commit | 241ed5734ee3c5b1417484dfa22af6cf6ae60b82 (patch) | |
| tree | c38b69ffe277b55cb64d422f4ba659608552d6a2 /OpenSim/Region/ScriptEngine | |
| parent | Comment and remove JScript support. Mono 2.7Dev and 2.8 no longer include the (diff) | |
| download | opensim-SC-241ed5734ee3c5b1417484dfa22af6cf6ae60b82.zip opensim-SC-241ed5734ee3c5b1417484dfa22af6cf6ae60b82.tar.gz opensim-SC-241ed5734ee3c5b1417484dfa22af6cf6ae60b82.tar.bz2 opensim-SC-241ed5734ee3c5b1417484dfa22af6cf6ae60b82.tar.xz | |
After aborting a thread, wait for it to actually finish. EXPERIMENTAL for OSG
testing. DO NOT UPDATE TO THIS UNLESS YOU KNOW WHAT YOU'RE DOING!
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index d30d2dc..f5b187f 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
| @@ -536,6 +536,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
| 536 | if (!m_InSelfDelete) | 536 | if (!m_InSelfDelete) |
| 537 | result.Abort(); | 537 | result.Abort(); |
| 538 | 538 | ||
| 539 | result.Wait(TimeSpan.FromSeconds(10)); | ||
| 539 | lock (m_EventQueue) | 540 | lock (m_EventQueue) |
| 540 | { | 541 | { |
| 541 | m_CurrentResult = null; | 542 | m_CurrentResult = null; |