Merge remote-tracking branch 'secondlife/release/26.4' into 26.4

1 files changed, 24 insertions, 11 deletions

diff --git a/indra/newview/llappviewerlinux.h b/indra/newview/llappviewerlinux.h
index 460ca721f1..faac3c0a05 100644
--- a/indra/newview/llappviewerlinux.h
+++ b/indra/newview/llappviewerlinux.h
@@ -27,36 +27,49 @@
 #ifndef LL_LLAPPVIEWERLINUX_H
 #define LL_LLAPPVIEWERLINUX_H
 
+extern "C" {
+# include <glib.h>
+}
+
 #ifndef LL_LLAPPVIEWER_H
 #include "llappviewer.h"
 #endif
 
 class LLCommandLineParser;
 
-class LLAppViewerLinux : public LLAppViewer
+class LLAppViewerLinux final : public LLAppViewer
 {
 public:
     LLAppViewerLinux();
-    virtual ~LLAppViewerLinux();
+    ~LLAppViewerLinux() override;
 
     //
     // Main application logic
     //
-    virtual bool init();            // Override to do application initialization
-    std::string generateSerialNumber();
+    bool init() override;            // Override to do application initialization
+    std::string generateSerialNumber() override;
     bool setupSLURLHandler();
 
 protected:
-    virtual bool beingDebugged();
+    bool beingDebugged() override;
+
+    bool restoreErrorTrap() override;
+    void initCrashReporting(bool reportFreeze);
+
+    bool initParseCommandLine(LLCommandLineParser& clp) override;
 
-    virtual bool restoreErrorTrap();
-    virtual void initCrashReporting(bool reportFreeze);
+    bool initSLURLHandler() override;
+    bool sendURLToOtherInstance(const std::string& url) override;
+    void setOSHibernationMode(eHibernationMode mode) override;
 
-    virtual void initLoggingAndGetLastDuration();
-    virtual bool initParseCommandLine(LLCommandLineParser& clp);
+private:
+    // Power management state tracking
+    static guint32 sPowerInhibitCookie;
+    static bool sPowerInhibitActive;
 
-    virtual bool initSLURLHandler();
-    virtual bool sendURLToOtherInstance(const std::string& url);
+    // Helper methods for power management
+    bool inhibitPowerManagement(bool inhibit_display);
+    void uninhibitPowerManagement();
 };
 
 #endif // LL_LLAPPVIEWERLINUX_H