aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-04 21:42:31 +0000
committerJustin Clarke Casey2008-11-04 21:42:31 +0000
commit41232ee9217e68c3f5e47abd3b193956c228dc7b (patch)
treec258c06767b95bb4adc6d3d9e14cc455636f559e /OpenSim/Framework
parent* Stop an exception in the thread tracker cleanup loop from terminating the sim (diff)
downloadopensim-SC_OLD-41232ee9217e68c3f5e47abd3b193956c228dc7b.zip
opensim-SC_OLD-41232ee9217e68c3f5e47abd3b193956c228dc7b.tar.gz
opensim-SC_OLD-41232ee9217e68c3f5e47abd3b193956c228dc7b.tar.bz2
opensim-SC_OLD-41232ee9217e68c3f5e47abd3b193956c228dc7b.tar.xz
* Correct build break from last commit - how on earth did it compile last time? Bizarre
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/ThreadTracker.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Framework/ThreadTracker.cs b/OpenSim/Framework/ThreadTracker.cs
index 0a63239..b9ba9b6 100644
--- a/OpenSim/Framework/ThreadTracker.cs
+++ b/OpenSim/Framework/ThreadTracker.cs
@@ -28,12 +28,17 @@
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection;
31using System.Threading; 32using System.Threading;
33using log4net;
32 34
33namespace OpenSim.Framework 35namespace OpenSim.Framework
34{ 36{
35 public static class ThreadTracker 37 public static class ThreadTracker
36 { 38 {
39 private static readonly ILog m_log
40 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
41
37 private static readonly long ThreadTimeout = 30 * 10000000; 42 private static readonly long ThreadTimeout = 30 * 10000000;
38 public static List<ThreadTrackerItem> m_Threads; 43 public static List<ThreadTrackerItem> m_Threads;
39 public static Thread ThreadTrackerThread; 44 public static Thread ThreadTrackerThread;