Manual merge from default branch.

Resolved a conflict in indra/llui/llurlentry.cpp. That broke the fix for EXT-6357.

--HG--
branch : product-engine

1 files changed, 4 insertions, 7 deletions

diff --git a/indra/newview/llloginhandler.h b/indra/newview/llloginhandler.h
index ac4648761b..c15b998c91 100644
--- a/indra/newview/llloginhandler.h
+++ b/indra/newview/llloginhandler.h
@@ -34,6 +34,7 @@
 #define LLLOGINHANDLER_H
 
 #include "llcommandhandler.h"
+#include "llsecapi.h"
 
 class LLLoginHandler : public LLCommandHandler
 {
@@ -46,19 +47,15 @@ class LLLoginHandler : public LLCommandHandler
 	// secondlife:///app/login?first=Bob&last=Dobbs
 	bool parseDirectLogin(std::string url);
 
-	std::string getFirstName() const { return mFirstName; }
-	std::string getLastName() const { return mLastName; }
-
 	// Web-based login unsupported
 	//LLUUID getWebLoginKey() const { return mWebLoginKey; }
 
+	LLPointer<LLCredential> loadSavedUserLoginInfo();  
+	LLPointer<LLCredential> initializeLoginInfo();
+
 private:
 	void parse(const LLSD& queryMap);
 
-private:
-	std::string mFirstName;
-	std::string mLastName;
-	//LLUUID mWebLoginKey;
 };
 
 extern LLLoginHandler gLoginHandler;