diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-08-15 11:41:00 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-08-15 11:41:00 -0400 |
| commit | 402a2de7651105d63693deb2872dd6646dd1bd85 (patch) | |
| tree | 5b0935f876e954a024227355c34a2c23eebe1b8d /indra/newview/llwatchdog.cpp | |
| parent | 60d15f78e17a2203d73d58c3f1c2af941d599277 (diff) | |
| parent | 6b70273603e4aa807662c301179d05a1f2f5a224 (diff) | |
merging latest viewer-mesh into nyx's sidebranch
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(); } |