diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2019-04-26 11:17:53 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2019-04-26 11:17:53 -0400 |
| commit | 0d596aa4de2f583862274350ce6287c0ed8c2bec (patch) | |
| tree | 90a6ca5b29d5c99b585233d059e16dccc23a2e19 /indra/newview/llwatchdog.cpp | |
| parent | 70aa89f708254c47766f4629e9131ea492829129 (diff) | |
| parent | 85b431d5137886927efef35ca558bc8a998a5212 (diff) | |
Automated merge with file:///Users/nat/linden/viewer-gridselect
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 2782cd9545..dd6c77ca7d 100644 --- a/indra/newview/llwatchdog.cpp +++ b/indra/newview/llwatchdog.cpp @@ -155,7 +155,7 @@ void LLWatchdogTimeout::ping(const std::string& state) // LLWatchdog LLWatchdog::LLWatchdog() : - mSuspectsAccessMutex(NULL), + mSuspectsAccessMutex(), mTimer(NULL), mLastClockCount(0), mKillerCallback(&default_killer_callback) @@ -185,7 +185,7 @@ void LLWatchdog::init(killer_event_callback func) mKillerCallback = func; if(!mSuspectsAccessMutex && !mTimer) { - mSuspectsAccessMutex = new LLMutex(NULL); + mSuspectsAccessMutex = new LLMutex(); mTimer = new LLWatchdogTimerThread(); mTimer->setSleepTime(WATCHDOG_SLEEP_TIME_USEC / 1000); mLastClockCount = LLTimer::getTotalTime(); |