Merge giab-viewer-trunk 2497, general merge of more

secapi stuff as well as certificate handling stuff.
Grid manager as well

1 files changed, 5 insertions, 9 deletions

diff --git a/indra/newview/llpanellogin.h b/indra/newview/llpanellogin.h
index 97350ce5c7..d33aa2d550 100644
--- a/indra/newview/llpanellogin.h
+++ b/indra/newview/llpanellogin.h
@@ -37,6 +37,7 @@
 #include "llpointer.h"			// LLPointer<>
 #include "llmediactrl.h"	// LLMediaCtrlObserver
 #include <boost/scoped_ptr.hpp>
+#include "llsecapi.h"
 
 class LLLineEditor;
 class LLUIImage;
@@ -65,15 +66,11 @@ 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);
+	static void setFields(LLPointer<LLCredential> credential, BOOL remember);
 
-	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);
+	static void getFields(LLPointer<LLCredential>& credential, BOOL& remember);
 
 	static BOOL isGridComboDirty();
 	static void getLocation(std::string &location);
@@ -85,7 +82,6 @@ public:
 	static void loadLoginPage();	
 	static void giveFocus();
 	static void setAlwaysRefresh(bool refresh); 
-	static void mungePassword(LLUICtrl* caller, void* user_data);
 	
 	// inherited from LLViewerMediaObserver
 	/*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event);
@@ -102,6 +98,7 @@ private:
 	static void onPassKey(LLLineEditor* caller, void* user_data);
 	static void onSelectServer(LLUICtrl*, void*);
 	static void onServerComboLostFocus(LLFocusableElement*);
+	static void updateServerCombo();
 	
 private:
 	LLPointer<LLUIImage> mLogoImage;
@@ -110,8 +107,7 @@ private:
 	void			(*mCallback)(S32 option, void *userdata);
 	void*			mCallbackData;
 
-	std::string mIncomingPassword;
-	std::string mMungedPassword;
+	BOOL            mPasswordModified;
 
 	static LLPanelLogin* sInstance;
 	static BOOL		sCapslockDidNotification;