diff options
| author | Paul ProductEngine <pguslisty@productengine.com> | 2011-08-15 20:35:39 +0300 |
|---|---|---|
| committer | Paul ProductEngine <pguslisty@productengine.com> | 2011-08-15 20:35:39 +0300 |
| commit | fecec49081419dbd7a66533e4d0457784b8d26a0 (patch) | |
| tree | 457018dc36300b5c2a355aedd771861d6b300697 /indra/newview/llwatchdog.cpp | |
| parent | c70a357a274d5acd7921c3185dc34b89069d4e61 (diff) | |
| parent | 5c0df02df5abdadbf17235ae5d7208963c25f1ce (diff) | |
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(); } |