diff options
| author | sacha | 2010-12-23 08:14:43 +0000 |
|---|---|---|
| committer | sacha | 2010-12-23 08:14:43 +0000 |
| commit | 98f0b4c72ad208e9f664d30bb6a84e0b2adf8214 (patch) | |
| tree | fdf6001af7f458fed5bf6f18df9be1882eb193d4 /OpenSim/Framework/Watchdog.cs | |
| parent | reactivating some traces to track a dead thread (diff) | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| download | opensim-SC-98f0b4c72ad208e9f664d30bb6a84e0b2adf8214.zip opensim-SC-98f0b4c72ad208e9f664d30bb6a84e0b2adf8214.tar.gz opensim-SC-98f0b4c72ad208e9f664d30bb6a84e0b2adf8214.tar.bz2 opensim-SC-98f0b4c72ad208e9f664d30bb6a84e0b2adf8214.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework/Watchdog.cs')
| -rw-r--r-- | OpenSim/Framework/Watchdog.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Watchdog.cs b/OpenSim/Framework/Watchdog.cs index 9baf3a0..3389ecb 100644 --- a/OpenSim/Framework/Watchdog.cs +++ b/OpenSim/Framework/Watchdog.cs | |||
| @@ -127,7 +127,7 @@ namespace OpenSim.Framework | |||
| 127 | m_threads.Add(threadInfo.Thread.ManagedThreadId, threadInfo); | 127 | m_threads.Add(threadInfo.Thread.ManagedThreadId, threadInfo); |
| 128 | } | 128 | } |
| 129 | 129 | ||
| 130 | private static bool RemoveThread(int threadID) | 130 | public static bool RemoveThread(int threadID) |
| 131 | { | 131 | { |
| 132 | lock (m_threads) | 132 | lock (m_threads) |
| 133 | return m_threads.Remove(threadID); | 133 | return m_threads.Remove(threadID); |