diff options
| author | Melanie | 2011-11-12 12:36:52 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-12 12:36:52 +0000 |
| commit | 6daa61d6ba2a4b10a1b060558208bcfa12f8ce5e (patch) | |
| tree | d674324ee3efb7bcc21f52fba509776a47466708 | |
| parent | Fix taking or returning locked objects losing permissions for owner (diff) | |
| parent | doh - correct build break (diff) | |
| download | opensim-SC_OLD-6daa61d6ba2a4b10a1b060558208bcfa12f8ce5e.zip opensim-SC_OLD-6daa61d6ba2a4b10a1b060558208bcfa12f8ce5e.tar.gz opensim-SC_OLD-6daa61d6ba2a4b10a1b060558208bcfa12f8ce5e.tar.bz2 opensim-SC_OLD-6daa61d6ba2a4b10a1b060558208bcfa12f8ce5e.tar.xz | |
Merge branch 'master' into bigmerge
| -rw-r--r-- | OpenSim/Framework/Watchdog.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Framework/Watchdog.cs b/OpenSim/Framework/Watchdog.cs index e26a6f2..4847675 100644 --- a/OpenSim/Framework/Watchdog.cs +++ b/OpenSim/Framework/Watchdog.cs | |||
| @@ -126,8 +126,7 @@ namespace OpenSim.Framework | |||
| 126 | thread.Name = name; | 126 | thread.Name = name; |
| 127 | thread.Priority = priority; | 127 | thread.Priority = priority; |
| 128 | thread.IsBackground = isBackground; | 128 | thread.IsBackground = isBackground; |
| 129 | thread.Start(); | 129 | |
| 130 | |||
| 131 | ThreadWatchdogInfo twi = new ThreadWatchdogInfo(thread, timeout); | 130 | ThreadWatchdogInfo twi = new ThreadWatchdogInfo(thread, timeout); |
| 132 | 131 | ||
| 133 | m_log.Debug("[WATCHDOG]: Started tracking thread \"" + twi.Thread.Name + "\" (ID " + twi.Thread.ManagedThreadId + ")"); | 132 | m_log.Debug("[WATCHDOG]: Started tracking thread \"" + twi.Thread.Name + "\" (ID " + twi.Thread.ManagedThreadId + ")"); |
| @@ -135,6 +134,8 @@ namespace OpenSim.Framework | |||
| 135 | lock (m_threads) | 134 | lock (m_threads) |
| 136 | m_threads.Add(twi.Thread.ManagedThreadId, twi); | 135 | m_threads.Add(twi.Thread.ManagedThreadId, twi); |
| 137 | 136 | ||
| 137 | thread.Start(); | ||
| 138 | |||
| 138 | return thread; | 139 | return thread; |
| 139 | } | 140 | } |
| 140 | 141 | ||