1 files changed, 10 insertions, 2 deletions

diff --git a/OpenSim/Framework/Watchdog.cs b/OpenSim/Framework/Watchdog.cs
index 5ffa890..952f039 100644
--- a/OpenSim/Framework/Watchdog.cs
+++ b/OpenSim/Framework/Watchdog.cs
@@ -164,7 +164,11 @@ namespace OpenSim.Framework
                 return m_threads.Remove(threadID);
         }
 
+<<<<<<< HEAD:OpenSim/Framework/Watchdog.cs
+        public static bool RemoveThread(int threadID)
+=======
         public static bool AbortThread(int threadID)
+>>>>>>> master:OpenSim/Framework/Watchdog.cs
         {
             lock (m_threads)
             {
@@ -194,10 +198,14 @@ namespace OpenSim.Framework
             try
             {
                 if (m_threads.TryGetValue(threadID, out threadInfo))
+<<<<<<< HEAD:OpenSim/Framework/Watchdog.cs
+                    threadInfo.LastTick = Environment.TickCount;
+=======
                 {
                     threadInfo.LastTick = Environment.TickCount & Int32.MaxValue;
                     threadInfo.IsTimedOut = false;
                 }
+>>>>>>> master:OpenSim/Framework/Watchdog.cs
                 else
                 {
                     m_log.WarnFormat("[WATCHDOG]: Asked to update thread {0} which is not being monitored", threadID);
@@ -226,7 +234,7 @@ namespace OpenSim.Framework
 
                 lock (m_threads)
                 {
-                    int now = Environment.TickCount & Int32.MaxValue;
+                    int now = Environment.TickCount;
 
                     foreach (ThreadWatchdogInfo threadInfo in m_threads.Values)
                     {
@@ -252,4 +260,4 @@ namespace OpenSim.Framework
             m_watchdogTimer.Start();
         }
     }
-}
\ No newline at end of file
+}