diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-08-31 10:48:56 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-08-31 10:48:56 -0600 |
| commit | 749d9ebadcd201e27a9453de7a2d9320d78efbb5 (patch) | |
| tree | 6e2119ba44dd37543a81c2b67644c5fa1ac2b698 /indra/newview/llwatchdog.cpp | |
| parent | bdd053abcffea1f4c30421176d0a3749027c6b7d (diff) | |
| parent | 48d949150cd445ce1e801a7a8ee67597a965f14b (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(); |