diff options
author | Richard Linden <none@none> | 2013-12-02 14:57:29 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2013-12-02 14:57:29 -0800 |
commit | 34ff2fc46ba8c623f0eab8fe1dccb5db327775a8 (patch) | |
tree | 7bc422dd969e1d18e9d83e52a9a6dcfa2bd6139f /indra/newview/llwatchdog.cpp | |
parent | 787ccaf297e81291469aaf269f563d862fb150a3 (diff) | |
parent | d8e92867162f8c4ff9489d8eefde53546e907dff (diff) |
merge with release
Diffstat (limited to 'indra/newview/llwatchdog.cpp')
-rwxr-xr-x | indra/newview/llwatchdog.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llwatchdog.cpp b/indra/newview/llwatchdog.cpp index 4f582fc2db..7b5bcf4db0 100755 --- a/indra/newview/llwatchdog.cpp +++ b/indra/newview/llwatchdog.cpp @@ -27,6 +27,7 @@ #include "llviewerprecompiledheaders.h" #include "llwatchdog.h" +#include "llthread.h" const U32 WATCHDOG_SLEEP_TIME_USEC = 1000000; @@ -221,7 +222,7 @@ void LLWatchdog::run() if(current_run_delta > (WATCHDOG_SLEEP_TIME_USEC * TIME_ELAPSED_MULTIPLIER)) { - llinfos << "Watchdog thread delayed: resetting entries." << llendl; + LL_INFOS() << "Watchdog thread delayed: resetting entries." << LL_ENDL; std::for_each(mSuspects.begin(), mSuspects.end(), std::mem_fun(&LLWatchdogEntry::reset) @@ -243,7 +244,7 @@ void LLWatchdog::run() mTimer->stop(); } - llinfos << "Watchdog detected error:" << llendl; + LL_INFOS() << "Watchdog detected error:" << LL_ENDL; mKillerCallback(); } } |