diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-09-24 07:50:57 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-24 07:50:57 +0300 |
| commit | 0ee1106faccf90c883d8b9ffc522a341659742ed (patch) | |
| tree | 1f99a78cf8e2e0a153696bbec1e385d3f4d0018f /indra/newview/llwatchdog.h | |
| parent | 67f4f1ae9b64610f63c1a353e739f9a807622713 (diff) | |
| parent | 776fae7dd7a6b5c1d0a2536248e767fdf4a565d4 (diff) | |
Merge pull request #2661 from Ansariel/develop-viewerdisplay-improvements
Performance improvements and cleanup in llviewerdisplay.cpp
Diffstat (limited to 'indra/newview/llwatchdog.h')
| -rw-r--r-- | indra/newview/llwatchdog.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llwatchdog.h b/indra/newview/llwatchdog.h index fe8932e298..1931c582b0 100644 --- a/indra/newview/llwatchdog.h +++ b/indra/newview/llwatchdog.h @@ -56,14 +56,14 @@ public: LLWatchdogTimeout(); virtual ~LLWatchdogTimeout(); - /* virtual */ bool isAlive() const; - /* virtual */ void reset(); - /* virtual */ void start() { start(""); } - /* virtual */ void stop(); + bool isAlive() const override; + void reset() override; + void start() override { start(""); } + void stop() override; - void start(const std::string& state); + void start(std::string_view state); void setTimeout(F32 d); - void ping(const std::string& state); + void ping(std::string_view state); const std::string& getState() {return mPingState; } private: |