OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor

avinationmerge
Tom 2010-08-03 14:12:05 -07:00
parent 1d1da5069c 6e3c79f31e
commit 2221517935
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Framework/Watchdog.cs
View File

@ -51,7 +51,7 @@ namespace OpenSim.Framework
public ThreadWatchdogInfo(Thread thread) public ThreadWatchdogInfo(Thread thread)
{ {
Thread = thread; Thread = thread;
LastTick = Environment.TickCount & Int32.MaxValue; LastTick = Environment.TickCount;
} }
} }
@ -143,7 +143,7 @@ namespace OpenSim.Framework
try try
{ {
if (m_threads.TryGetValue(threadID, out threadInfo)) if (m_threads.TryGetValue(threadID, out threadInfo))
threadInfo.LastTick = Environment.TickCount & Int32.MaxValue; threadInfo.LastTick = Environment.TickCount;
else else
AddThread(new ThreadWatchdogInfo(Thread.CurrentThread)); AddThread(new ThreadWatchdogInfo(Thread.CurrentThread));
} }
@ -160,7 +160,7 @@ namespace OpenSim.Framework
lock (m_threads) lock (m_threads)
{ {
int now = Environment.TickCount & Int32.MaxValue; int now = Environment.TickCount;
foreach (ThreadWatchdogInfo threadInfo in m_threads.Values) foreach (ThreadWatchdogInfo threadInfo in m_threads.Values)
{ {