diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2011-07-27 14:14:22 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2011-07-27 14:14:22 -0700 |
| commit | 47f23dd5a54292aaf5a3fc146bc58b8dba650700 (patch) | |
| tree | 2323f3f89a4c4bdf6e4c57bf10eb9a05426b9722 /indra/newview/llwatchdog.cpp | |
| parent | 825fc273ee5167052d811dc058b1834c86e005da (diff) | |
| parent | f8ad1412c18946420253f07993b6b1e7fa446cfa (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llwatchdog.cpp')
| -rw-r--r-- | indra/newview/llwatchdog.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llwatchdog.cpp b/indra/newview/llwatchdog.cpp index 1694126802..4f582fc2db 100644 --- a/indra/newview/llwatchdog.cpp +++ b/indra/newview/llwatchdog.cpp @@ -126,8 +126,8 @@ void LLWatchdogTimeout::start(const std::string& state) // Order of operation is very impmortant here. // After LLWatchdogEntry::start() is called // LLWatchdogTimeout::isAlive() will be called asynchronously. - mTimer.start(); ping(state); + mTimer.start(); LLWatchdogEntry::start(); } |