diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-09-06 09:42:11 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-09-06 09:42:11 -0400 |
| commit | 08c0de785f29801c57feebce8fae593f86113777 (patch) | |
| tree | 6661b84ca6540f0907b4321f6e49a88be75c2e98 /indra/newview/llwatchdog.cpp | |
| parent | 76f867c8913094573bfa278fc39907d6b0779ec5 (diff) | |
| parent | 0ab6eee0996c78d32b722157140cea5a21a5e460 (diff) | |
merge
Diffstat (limited to 'indra/newview/llwatchdog.cpp')
| -rw-r--r-- | indra/newview/llwatchdog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llwatchdog.cpp b/indra/newview/llwatchdog.cpp index 4f582fc2db..64ca94b567 100644 --- a/indra/newview/llwatchdog.cpp +++ b/indra/newview/llwatchdog.cpp @@ -178,8 +178,8 @@ void LLWatchdog::init(killer_event_callback func) mKillerCallback = func; if(!mSuspectsAccessMutex && !mTimer) { - mSuspectsAccessMutex = new LLMutex(NULL); - mTimer = new LLWatchdogTimerThread(); + mSuspectsAccessMutex = new LLMutex; + mTimer = new LLWatchdogTimerThread; mTimer->setSleepTime(WATCHDOG_SLEEP_TIME_USEC / 1000); mLastClockCount = LLTimer::getTotalTime(); |