diff options
| author | Melanie | 2009-10-02 08:23:38 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-02 08:23:38 +0100 |
| commit | 31d8cec0f8cd47ff445edc7771e5e73825a57927 (patch) | |
| tree | a2d60604317739fa530502c40ffc71bab2a5c494 /OpenSim/Framework/ThreadTracker.cs | |
| parent | Restore the missing image handling to the image manager. The missing (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.zip opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.gz opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.bz2 opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.xz | |
Merge branch 'master' into diva-textures
Diffstat (limited to 'OpenSim/Framework/ThreadTracker.cs')
| -rw-r--r-- | OpenSim/Framework/ThreadTracker.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/ThreadTracker.cs b/OpenSim/Framework/ThreadTracker.cs index fa6f0b8..d3a239d 100644 --- a/OpenSim/Framework/ThreadTracker.cs +++ b/OpenSim/Framework/ThreadTracker.cs | |||
| @@ -57,7 +57,7 @@ namespace OpenSim.Framework | |||
| 57 | } | 57 | } |
| 58 | 58 | ||
| 59 | private static void ThreadTrackerThreadLoop() | 59 | private static void ThreadTrackerThreadLoop() |
| 60 | { | 60 | { |
| 61 | try | 61 | try |
| 62 | { | 62 | { |
| 63 | while (true) | 63 | while (true) |
| @@ -70,8 +70,8 @@ namespace OpenSim.Framework | |||
| 70 | { | 70 | { |
| 71 | m_log.ErrorFormat( | 71 | m_log.ErrorFormat( |
| 72 | "[THREAD TRACKER]: Thread tracker cleanup thread terminating with exception. Please report this error. Exception is {0}", | 72 | "[THREAD TRACKER]: Thread tracker cleanup thread terminating with exception. Please report this error. Exception is {0}", |
| 73 | e); | 73 | e); |
| 74 | } | 74 | } |
| 75 | } | 75 | } |
| 76 | 76 | ||
| 77 | public static void Add(Thread thread) | 77 | public static void Add(Thread thread) |