diff options
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Watchdog.cs | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/OpenSim/Framework/Watchdog.cs b/OpenSim/Framework/Watchdog.cs index 952f039..e26a6f2 100644 --- a/OpenSim/Framework/Watchdog.cs +++ b/OpenSim/Framework/Watchdog.cs | |||
@@ -164,11 +164,7 @@ namespace OpenSim.Framework | |||
164 | return m_threads.Remove(threadID); | 164 | return m_threads.Remove(threadID); |
165 | } | 165 | } |
166 | 166 | ||
167 | <<<<<<< HEAD:OpenSim/Framework/Watchdog.cs | ||
168 | public static bool RemoveThread(int threadID) | ||
169 | ======= | ||
170 | public static bool AbortThread(int threadID) | 167 | public static bool AbortThread(int threadID) |
171 | >>>>>>> master:OpenSim/Framework/Watchdog.cs | ||
172 | { | 168 | { |
173 | lock (m_threads) | 169 | lock (m_threads) |
174 | { | 170 | { |
@@ -198,14 +194,10 @@ namespace OpenSim.Framework | |||
198 | try | 194 | try |
199 | { | 195 | { |
200 | if (m_threads.TryGetValue(threadID, out threadInfo)) | 196 | if (m_threads.TryGetValue(threadID, out threadInfo)) |
201 | <<<<<<< HEAD:OpenSim/Framework/Watchdog.cs | ||
202 | threadInfo.LastTick = Environment.TickCount; | ||
203 | ======= | ||
204 | { | 197 | { |
205 | threadInfo.LastTick = Environment.TickCount & Int32.MaxValue; | 198 | threadInfo.LastTick = Environment.TickCount & Int32.MaxValue; |
206 | threadInfo.IsTimedOut = false; | 199 | threadInfo.IsTimedOut = false; |
207 | } | 200 | } |
208 | >>>>>>> master:OpenSim/Framework/Watchdog.cs | ||
209 | else | 201 | else |
210 | { | 202 | { |
211 | m_log.WarnFormat("[WATCHDOG]: Asked to update thread {0} which is not being monitored", threadID); | 203 | m_log.WarnFormat("[WATCHDOG]: Asked to update thread {0} which is not being monitored", threadID); |