1 files changed, 22 insertions, 7 deletions

diff --git a/linden/indra/newview/llappviewer.h b/linden/indra/newview/llappviewer.h
index 58dc835..9583982 100644
--- a/linden/indra/newview/llappviewer.h
+++ b/linden/indra/newview/llappviewer.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -77,7 +77,9 @@ public:
         // Report true if under the control of a debugger. A null-op default.
         virtual bool beingDebugged() { return false; } 
 
-        virtual void handleCrashReporting() = 0; // What to do with crash report?
+        virtual bool restoreErrorTrap() = 0; // Require platform specific override to reset error handling mechanism.
+                                             // return false if the error trap needed restoration.
+        virtual void handleCrashReporting(bool reportFreeze = false) = 0; // What to do with crash report?
         virtual void handleSyncCrashTrace() = 0; // any low-level crash-prep that has to happen in the context of the crashing thread before the crash report is delivered.
         static void handleViewerCrash(); // Hey! The viewer crashed. Do this, soon.
         static void handleSyncViewerCrash(); // Hey! The viewer crashed. Do this right NOW in the context of the crashing thread.
@@ -112,6 +114,7 @@ public:
     virtual void forceErrorBadMemoryAccess();
     virtual void forceErrorInifiniteLoop();
     virtual void forceErrorSoftwareException();
+    virtual void forceErrorDriverCrash();
 
         // *NOTE: There are currently 3 settings files: 
         // "Global", "PerAccount" and "CrashSettings"
@@ -136,16 +139,22 @@ public:
         void resumeMainloopTimeout(const std::string& state = "", F32 secs = -1.0f);
         void pingMainloopTimeout(const std::string& state, F32 secs = -1.0f);
 
+        // Handle the 'login completed' event.
+        // *NOTE:Mani Fix this for login abstraction!!
+        void handleLoginComplete();
+
 protected:
 
         virtual bool initWindow(); // Initialize the viewer's window.
         virtual bool initLogging(); // Initialize log files, logging system, return false on failure.
         virtual void initConsole() {}; // Initialize OS level debugging console.
         virtual bool initHardwareTest() { return true; } // A false result indicates the app should quit.
+        virtual bool initSLURLHandler();
+        virtual bool sendURLToOtherInstance(const std::string& url);
 
-    virtual bool initParseCommandLine(LLCommandLineParser& clp) 
+        virtual bool initParseCommandLine(LLCommandLineParser& clp) 
         { return true; } // Allow platforms to specify the command line args.
-        
+
         virtual std::string generateSerialNumber() = 0; // Platforms specific classes generate this.
 
 private:
@@ -211,6 +220,15 @@ private:
         // for tracking viewer<->region circuit death
         bool mAgentRegionLastAlive;
         LLUUID mAgentRegionLastID;
+
+public:
+        //some information for updater
+        typedef struct
+        {
+                std::string mUpdateExePath;
+                std::ostringstream mParams;
+        }LLUpdaterInfo ;
+        static LLUpdaterInfo *sUpdaterInfo ;
 };
 
 // consts from viewer.h
@@ -221,9 +239,6 @@ const S32 AGENT_UPDATES_PER_SECOND  = 10;
 //
 // "// llstartup" indicates that llstartup is the only client for this global.
 
-extern BOOL gHandleKeysAsync; // gSavedSettings used by llviewerdisplay.cpp & llviewermenu.cpp
-extern std::string gDisabledMessage; // llstartup
-extern BOOL gHideLinks; // used by llpanellogin, lllfloaterbuycurrency, llstartup
 extern LLSD gDebugInfo;
 
 extern BOOL     gAllowIdleAFK;