Second Life viewer sources 1.23.0-RC

1 files changed, 14 insertions, 34 deletions

diff --git a/linden/indra/newview/llpanellogin.h b/linden/indra/newview/llpanellogin.h
index dba6cf4..47d42da 100644
--- a/linden/indra/newview/llpanellogin.h
+++ b/linden/indra/newview/llpanellogin.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -33,36 +34,11 @@
 #define LL_LLPANELLOGIN_H
 
 #include "llpanel.h"
-#include "llcommandhandler.h"
-#include "lldbstrings.h"
-#include "llmemory.h"
-#include "llviewerimage.h"
-#include "llstring.h"
-#include "llmd5.h"
-#include "llwebbrowserctrl.h"
-
-class LLTextBox;
-class LLLineEditor;
-class LLCheckBoxCtrl;
-class LLButton;
-class LLComboBox;
-
-
-class LLLoginHandler : public LLCommandHandler
-{
- public:
-        // allow from external browsers
-        LLLoginHandler() : LLCommandHandler("login", true) { }
-        bool handle(const LLSD& tokens, const LLSD& queryMap);
-        bool parseDirectLogin(std::string url);
-        void parse(const LLSD& queryMap);
-
-        LLUUID mWebLoginKey;
-        std::string mFirstName;
-        std::string mLastName;
-};
+#include "llmemory.h"                   // LLPointer<>
+#include "llwebbrowserctrl.h"   // LLWebBrowserCtrlObserver
+
+class LLUIImage;
 
-extern LLLoginHandler gLoginHandler;
 
 class LLPanelLogin:     
         public LLPanel,
@@ -83,14 +59,15 @@ public:
                 void (*callback)(S32 option, void* user_data), 
                 void* callback_data);
 
+        // Remember password checkbox is set via gSavedSettings "RememberPassword"
         static void setFields(const std::string& firstname, const std::string& lastname, 
-                const std::string& password, BOOL remember);
+                const std::string& password);
 
         static void addServer(const std::string& server, S32 domain_name);
         static void refreshLocation( bool force_visible );
 
-        static void getFields(std::string& firstname, std::string& lastname,
-                                                  std::string& password, BOOL& remember);
+        static void getFields(std::string *firstname, std::string *lastname,
+                                                  std::string *password);
 
         static BOOL isGridComboDirty();
         static void getLocation(std::string &location);
@@ -107,7 +84,7 @@ public:
 private:
         static void onClickConnect(void*);
         static void onClickNewAccount(void*);
-        static void newAccountAlertCallback(S32 option, void*);
+        static bool newAccountAlertCallback(const LLSD& notification, const LLSD& response);
         static void onClickQuit(void*);
         static void onClickVersion(void*);
         virtual void onNavigateComplete( const EventType& eventIn );
@@ -130,4 +107,7 @@ private:
         BOOL                    mHtmlAvailable;
 };
 
+std::string load_password_from_disk(void);
+void save_password_to_disk(const char* hashed_password);
+
 #endif