svn merge -r105329:105903 svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge

Resolving QAR-1051 Merge featurettes batch #4

1 files changed, 7 insertions, 29 deletions

diff --git a/indra/newview/llpanellogin.h b/indra/newview/llpanellogin.h
index aa41ab70b8..9d7e386cda 100644
--- a/indra/newview/llpanellogin.h
+++ b/indra/newview/llpanellogin.h
@@ -33,36 +33,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,
@@ -130,4 +105,7 @@ private:
 	BOOL			mHtmlAvailable;
 };
 
+std::string load_password_from_disk(void);
+void save_password_to_disk(const char* hashed_password);
+
 #endif