diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2011-07-15 16:25:38 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2011-07-15 16:25:38 -0700 |
| commit | f8ad1412c18946420253f07993b6b1e7fa446cfa (patch) | |
| tree | d278e43cbf8dfd5e5d5a0ecfbe5b3c0d420d57c3 /indra/newview/llwatchdog.cpp | |
| parent | fc5aaf5df8d3b064c05539c7b6911a4c3f4dc1c7 (diff) | |
| parent | b88c7166f4323d9035bc78f517ff51396e80c123 (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(); } |