diff options
| author | Melanie | 2010-06-02 17:39:58 +0100 |
|---|---|---|
| committer | Melanie | 2010-06-02 17:39:58 +0100 |
| commit | c5cfae7bac9273d32c78409fe5080a202043b277 (patch) | |
| tree | 9715a56bc6dc7b9516fe73d30c18f1003089247f /OpenSim | |
| parent | After aborting a thread, wait for it to actually finish. EXPERIMENTAL for OSG (diff) | |
| download | opensim-SC_OLD-c5cfae7bac9273d32c78409fe5080a202043b277.zip opensim-SC_OLD-c5cfae7bac9273d32c78409fe5080a202043b277.tar.gz opensim-SC_OLD-c5cfae7bac9273d32c78409fe5080a202043b277.tar.bz2 opensim-SC_OLD-c5cfae7bac9273d32c78409fe5080a202043b277.tar.xz | |
Revert "After aborting a thread, wait for it to actually finish. EXPERIMENTAL for OSG"
This reverts commit 241ed5734ee3c5b1417484dfa22af6cf6ae60b82.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index f5b187f..d30d2dc 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
| @@ -536,7 +536,6 @@ 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)); | ||
| 540 | lock (m_EventQueue) | 539 | lock (m_EventQueue) |
| 541 | { | 540 | { |
| 542 | m_CurrentResult = null; | 541 | m_CurrentResult = null; |