diff options
| author | Melanie | 2009-10-15 21:14:13 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-15 21:14:13 +0100 |
| commit | 6deef7d0f3e9657bdc7bc4c41011dba15fea944b (patch) | |
| tree | ffa84d5963afbb5390b132278c95df20b21681d5 /OpenSim/Framework/Parallel.cs | |
| parent | Merge branch 'master' into vehicles (diff) | |
| parent | Merge branch 'htb-throttle' of ssh://opensimulator.org/var/git/opensim into h... (diff) | |
| download | opensim-SC_OLD-6deef7d0f3e9657bdc7bc4c41011dba15fea944b.zip opensim-SC_OLD-6deef7d0f3e9657bdc7bc4c41011dba15fea944b.tar.gz opensim-SC_OLD-6deef7d0f3e9657bdc7bc4c41011dba15fea944b.tar.bz2 opensim-SC_OLD-6deef7d0f3e9657bdc7bc4c41011dba15fea944b.tar.xz | |
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Framework/Parallel.cs')
| -rw-r--r-- | OpenSim/Framework/Parallel.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Framework/Parallel.cs b/OpenSim/Framework/Parallel.cs index 74537ba..6efdad0 100644 --- a/OpenSim/Framework/Parallel.cs +++ b/OpenSim/Framework/Parallel.cs | |||
| @@ -89,6 +89,7 @@ namespace OpenSim.Framework | |||
| 89 | } | 89 | } |
| 90 | 90 | ||
| 91 | threadFinishEvent.WaitOne(); | 91 | threadFinishEvent.WaitOne(); |
| 92 | threadFinishEvent.Close(); | ||
| 92 | 93 | ||
| 93 | if (exception != null) | 94 | if (exception != null) |
| 94 | throw new Exception(exception.Message, exception); | 95 | throw new Exception(exception.Message, exception); |
| @@ -148,6 +149,7 @@ namespace OpenSim.Framework | |||
| 148 | } | 149 | } |
| 149 | 150 | ||
| 150 | threadFinishEvent.WaitOne(); | 151 | threadFinishEvent.WaitOne(); |
| 152 | threadFinishEvent.Close(); | ||
| 151 | 153 | ||
| 152 | if (exception != null) | 154 | if (exception != null) |
| 153 | throw new Exception(exception.Message, exception); | 155 | throw new Exception(exception.Message, exception); |
| @@ -199,6 +201,7 @@ namespace OpenSim.Framework | |||
| 199 | } | 201 | } |
| 200 | 202 | ||
| 201 | threadFinishEvent.WaitOne(); | 203 | threadFinishEvent.WaitOne(); |
| 204 | threadFinishEvent.Close(); | ||
| 202 | 205 | ||
| 203 | if (exception != null) | 206 | if (exception != null) |
| 204 | throw new Exception(exception.Message, exception); | 207 | throw new Exception(exception.Message, exception); |