aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/ThirdParty
diff options
context:
space:
mode:
authorMelanie2010-06-02 18:00:44 +0100
committerMelanie2010-06-02 18:00:44 +0100
commitc38f7c96e78436cbefcbbe1d8820e28488f6d2dd (patch)
tree9715a56bc6dc7b9516fe73d30c18f1003089247f /ThirdParty
parentNext OSG TEST RELEASE. Join aborted threads. (diff)
downloadopensim-SC-c38f7c96e78436cbefcbbe1d8820e28488f6d2dd.zip
opensim-SC-c38f7c96e78436cbefcbbe1d8820e28488f6d2dd.tar.gz
opensim-SC-c38f7c96e78436cbefcbbe1d8820e28488f6d2dd.tar.bz2
opensim-SC-c38f7c96e78436cbefcbbe1d8820e28488f6d2dd.tar.xz
Revert "Next OSG TEST RELEASE. Join aborted threads."
This reverts commit 698066d7e3a59281b6b1caa499ad32ff389c8bb6.
Diffstat (limited to 'ThirdParty')
-rw-r--r--ThirdParty/SmartThreadPool/WorkItem.cs3
1 files changed, 0 insertions, 3 deletions
diff --git a/ThirdParty/SmartThreadPool/WorkItem.cs b/ThirdParty/SmartThreadPool/WorkItem.cs
index 12668b0..d0c0524 100644
--- a/ThirdParty/SmartThreadPool/WorkItem.cs
+++ b/ThirdParty/SmartThreadPool/WorkItem.cs
@@ -1027,10 +1027,7 @@ namespace Amib.Threading.Internal
1027 lock (this) 1027 lock (this)
1028 { 1028 {
1029 if(currentThread != null) 1029 if(currentThread != null)
1030 {
1031 currentThread.Abort(); 1030 currentThread.Abort();
1032 currentThread.Join();
1033 }
1034 } 1031 }
1035 } 1032 }
1036 } 1033 }