diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-04 15:37:31 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-04 15:37:31 -0400 |
| commit | 94c171d89bae06d0bc259255a917db892019c369 (patch) | |
| tree | 7ad345f7accb18308d75367ed40326131d229cab /indra/newview/llwatchdog.cpp | |
| parent | 4ba18501ea2f8c45b2366b6caaeeb7c9ffe6038f (diff) | |
| parent | 468d81048602d5369209ef2f945b63db381423eb (diff) | |
merge changes for storm-1355
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(); } |