Merge branch '2025.05' into 2025.06

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: