diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-07-19 23:48:11 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-07-19 23:48:11 -0600 |
| commit | 83e48f4a5100ab1adadc27a3e7a0b23b68b8b568 (patch) | |
| tree | 68a2b81442389d1f9e54bce3dca5bc0e47b7a3e6 /indra/newview/llwatchdog.cpp | |
| parent | 4dc0850da7469906e5ad052da71830b05005295b (diff) | |
| parent | 76eca5d0bce3e303f6d77b0d16f114320830ac6a (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 1694126802..d982ca5020 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(); |