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

Merge branch 'master' into bigmerge

avinationmerge
Melanie 2011-11-12 12:36:52 +00:00
parent efc6c6db7c e61ea79c72
commit 6daa61d6ba
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Framework/Watchdog.cs
View File

@ -126,7 +126,6 @@ namespace OpenSim.Framework
thread.Name = name; thread.Name = name;
thread.Priority = priority; thread.Priority = priority;
thread.IsBackground = isBackground; thread.IsBackground = isBackground;
thread.Start();
ThreadWatchdogInfo twi = new ThreadWatchdogInfo(thread, timeout); ThreadWatchdogInfo twi = new ThreadWatchdogInfo(thread, timeout);
@ -135,6 +134,8 @@ namespace OpenSim.Framework
lock (m_threads) lock (m_threads)
m_threads.Add(twi.Thread.ManagedThreadId, twi); m_threads.Add(twi.Thread.ManagedThreadId, twi);
thread.Start();
return thread; return thread;
} }