diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-10-27 14:54:57 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-10-27 14:54:57 -0400 |
| commit | 8c318d16393229044a401243a95fc8bb5e805c7f (patch) | |
| tree | 56edab693a1977fb117eb7e2d85b60648898cee1 /indra/newview/llwatchdog.cpp | |
| parent | 1eda81eac813447cd357ac1972654ee9c1ec5506 (diff) | |
| parent | e062be734ae421cc793a4c5e2e077a0c1d22262d (diff) | |
reconciled .hgtags
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 64ca94b567..4f582fc2db 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; - mTimer = new LLWatchdogTimerThread; + mSuspectsAccessMutex = new LLMutex(NULL); + mTimer = new LLWatchdogTimerThread(); mTimer->setSleepTime(WATCHDOG_SLEEP_TIME_USEC / 1000); mLastClockCount = LLTimer::getTotalTime(); |