diff options
author | UbitUmarov | 2017-05-27 05:47:05 +0100 |
---|---|---|
committer | UbitUmarov | 2017-05-27 05:47:05 +0100 |
commit | c54985f8a16a00032a3647112555b5c82b43efde (patch) | |
tree | 862483e0e10e4862e99b5437340e326df3f3f072 /OpenSim/Region/Application | |
parent | Merge branch 'master' into httptests (diff) | |
parent | minor cleanup (diff) | |
download | opensim-SC-c54985f8a16a00032a3647112555b5c82b43efde.zip opensim-SC-c54985f8a16a00032a3647112555b5c82b43efde.tar.gz opensim-SC-c54985f8a16a00032a3647112555b5c82b43efde.tar.bz2 opensim-SC-c54985f8a16a00032a3647112555b5c82b43efde.tar.xz |
Merge branch 'master' into httptests
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 5977f40..fcc8717 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -511,8 +511,6 @@ namespace OpenSim | |||
511 | private void WatchdogTimeoutHandler(Watchdog.ThreadWatchdogInfo twi) | 511 | private void WatchdogTimeoutHandler(Watchdog.ThreadWatchdogInfo twi) |
512 | { | 512 | { |
513 | int now = Environment.TickCount & Int32.MaxValue; | 513 | int now = Environment.TickCount & Int32.MaxValue; |
514 | if(twi.Thread.ThreadState == System.Threading.ThreadState.Stopped) | ||
515 | return; | ||
516 | m_log.ErrorFormat( | 514 | m_log.ErrorFormat( |
517 | "[WATCHDOG]: Timeout detected for thread \"{0}\". ThreadState={1}. Last tick was {2}ms ago. {3}", | 515 | "[WATCHDOG]: Timeout detected for thread \"{0}\". ThreadState={1}. Last tick was {2}ms ago. {3}", |
518 | twi.Thread.Name, | 516 | twi.Thread.Name, |