1 files changed, 17 insertions, 10 deletions

diff --git a/linden/indra/newview/llappviewer.h b/linden/indra/newview/llappviewer.h
index 797f5dd..ada5557 100644
--- a/linden/indra/newview/llappviewer.h
+++ b/linden/indra/newview/llappviewer.h
@@ -62,14 +62,16 @@ public:
 
         // Application control
         void forceQuit(); // Puts the viewer into 'shutting down without error' mode.
-        void requestQuit(); // Request a quit. A kinder, gentler quit.
+        void requestLogout(bool quit_after); // Request a logout, optionally quitting after
         void userQuit(); // The users asks to quit. Confirm, then requestQuit()
     void earlyExit(const std::string& name, 
                                    const LLSD& substitutions = LLSD()); // Display an error dialog and forcibly quit.
+        static void userLogout(void *userdata); //graceful logout without quit
     void forceExit(S32 arg); // exit() immediately (after some cleanup).
     void abortQuit();  // Called to abort a quit request.
 
     bool quitRequested() { return mQuitRequested; }
+    bool logoutRequested() { return mLogoutRequested; }
     bool logoutRequestSent() { return mLogoutRequestSent; }
 
         void writeDebugInfo();
@@ -164,11 +166,12 @@ protected:
 
         virtual std::string generateSerialNumber() = 0; // Platforms specific classes generate this.
 
+
 private:
 
         bool initThreads(); // Initialize viewer threads, return false on failure.
         bool initConfiguration(); // Initialize settings from the command line/config file.
-        void initGridChoice();
+        //void initGridChoice();
 
         bool initCache(); // Initialize local client cache.
         void purgeCache(); // Clear the local cache. 
@@ -222,6 +225,7 @@ private:
         bool mSavedFinalSnapshot;
 
     bool mQuitRequested;                                // User wants to quit, may have modified documents open.
+    bool mLogoutRequested;                              // User wants to log out, but not quit
     bool mLogoutRequestSent;                    // Disconnect message sent to simulator, no longer safe to send messages to the sim.
     S32 mYieldTime;
         LLSD mSettingsLocationList;
@@ -232,14 +236,14 @@ private:
         bool mAgentRegionLastAlive;
         LLUUID mAgentRegionLastID;
 
-public:
-        //some information for updater
-        typedef struct
-        {
-                std::string mUpdateExePath;
-                std::ostringstream mParams;
-        }LLUpdaterInfo ;
-        static LLUpdaterInfo *sUpdaterInfo ;
+//public:
+//      //some information for updater
+//      typedef struct
+//      {
+//              std::string mUpdateExePath;
+//              std::ostringstream mParams;
+//      }LLUpdaterInfo ;
+//      static LLUpdaterInfo *sUpdaterInfo ;
 };
 
 // consts from viewer.h
@@ -250,6 +254,9 @@ const S32 AGENT_UPDATES_PER_SECOND  = 10;
 //
 // "// llstartup" indicates that llstartup is the only client for this global.
 
+
+extern std::string gDisabledMessage; // llstartup
+extern BOOL gHideLinks; // used by llpanellogin, lllfloaterbuycurrency, llstartup
 extern LLSD gDebugInfo;
 
 extern BOOL     gAllowIdleAFK;