ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 09:45:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into bigmerge

Browse Source 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
This commit is contained in:
Melanie
2011-10-26 17:48:51 +01:00
parent fd22159d0c 4a472b74c7
commit 6a96c9546d
10 changed files with 120 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Framework/Watchdog.cs
View File

@@ -164,11 +164,7 @@ 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)
{
@@ -198,14 +194,10 @@ 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);