diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-08-08 18:32:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-08 18:32:24 -0400 |
| commit | 28678996ceaea019aafaa26911a440769320c498 (patch) | |
| tree | 1c5461d5b432b2b6114faee0ebfb1bb2d2f5095a /indra/newview/llwatchdog.h | |
| parent | a6feb3dc7f3b1985bcc6a16330b368917cff25f8 (diff) | |
| parent | f338b91f7c9dbfe999b5ea9a1facb9eaeafb3407 (diff) | |
Merge pull request #4382 from secondlife/release/2025.05
Release/2025.05
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: |