diff options
| author | Aleric Inglewood | 2010-11-10 15:19:13 +0100 |
|---|---|---|
| committer | Aleric Inglewood | 2010-11-17 01:03:18 +0100 |
| commit | b66950bc26cfb3210e786c966141b20a5cc13a84 (patch) | |
| tree | 5afd535bfd59f1fb1fc6d9132958965c527aa0ee /linden/indra/newview/llwatchdog.cpp | |
| parent | IMP-712: Add shortcut for the Groups tab. (diff) | |
| download | meta-impy-b66950bc26cfb3210e786c966141b20a5cc13a84.zip meta-impy-b66950bc26cfb3210e786c966141b20a5cc13a84.tar.gz meta-impy-b66950bc26cfb3210e786c966141b20a5cc13a84.tar.bz2 meta-impy-b66950bc26cfb3210e786c966141b20a5cc13a84.tar.xz | |
IMP-590: Added a thread-safe and robust wrapper for APR pools.
See http://redmine.imprudenceviewer.org/issues/590
Diffstat (limited to 'linden/indra/newview/llwatchdog.cpp')
| -rw-r--r-- | linden/indra/newview/llwatchdog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llwatchdog.cpp b/linden/indra/newview/llwatchdog.cpp index 330bc8a..9af050c 100644 --- a/linden/indra/newview/llwatchdog.cpp +++ b/linden/indra/newview/llwatchdog.cpp | |||
| @@ -184,8 +184,8 @@ void LLWatchdog::init(killer_event_callback func) | |||
| 184 | mKillerCallback = func; | 184 | mKillerCallback = func; |
| 185 | if(!mSuspectsAccessMutex && !mTimer) | 185 | if(!mSuspectsAccessMutex && !mTimer) |
| 186 | { | 186 | { |
| 187 | mSuspectsAccessMutex = new LLMutex(NULL); | 187 | mSuspectsAccessMutex = new LLMutex; |
| 188 | mTimer = new LLWatchdogTimerThread(); | 188 | mTimer = new LLWatchdogTimerThread; |
| 189 | mTimer->setSleepTime(WATCHDOG_SLEEP_TIME_USEC / 1000); | 189 | mTimer->setSleepTime(WATCHDOG_SLEEP_TIME_USEC / 1000); |
| 190 | mLastClockCount = LLTimer::getTotalTime(); | 190 | mLastClockCount = LLTimer::getTotalTime(); |
| 191 | 191 | ||