diff options
| author | Melanie | 2010-12-22 03:25:30 +0100 |
|---|---|---|
| committer | Melanie | 2010-12-22 03:25:30 +0100 |
| commit | cf37b3b9434ca940fa635c0e951fa9ac7c07175a (patch) | |
| tree | 0a8a04c233d6b7f8a785b0c9523d36ae5abcda36 /OpenSim/Framework | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| download | opensim-SC_OLD-cf37b3b9434ca940fa635c0e951fa9ac7c07175a.zip opensim-SC_OLD-cf37b3b9434ca940fa635c0e951fa9ac7c07175a.tar.gz opensim-SC_OLD-cf37b3b9434ca940fa635c0e951fa9ac7c07175a.tar.bz2 opensim-SC_OLD-cf37b3b9434ca940fa635c0e951fa9ac7c07175a.tar.xz | |
Prevent a null ref when an avatar login doesn't go as planned
Diffstat (limited to '')
| -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); |