summaryrefslogtreecommitdiff
path: root/indra/newview/llpanellogin.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llpanellogin.h')
-rw-r--r--indra/newview/llpanellogin.h29
1 files changed, 14 insertions, 15 deletions
diff --git a/indra/newview/llpanellogin.h b/indra/newview/llpanellogin.h
index 9301c263da..1fdc3a9361 100644
--- a/indra/newview/llpanellogin.h
+++ b/indra/newview/llpanellogin.h
@@ -41,8 +41,6 @@
class LLLineEditor;
class LLUIImage;
class LLPanelLoginListener;
-class LLSLURL;
-class LLCredential;
class LLPanelLogin:
public LLPanel,
@@ -67,16 +65,20 @@ public:
void (*callback)(S32 option, void* user_data),
void* callback_data);
- static void setFields(LLPointer<LLCredential> credential, BOOL remember);
+ // 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 getFields(LLPointer<LLCredential>& credential, BOOL remember);
+ static void addServer(const std::string& server, S32 domain_name);
+ static void refreshLocation( bool force_visible );
+ static void updateLocationUI();
+
+ static void getFields(std::string *firstname, std::string *lastname,
+ std::string *password);
static BOOL isGridComboDirty();
- static BOOL areCredentialFieldsDirty();
- static void getLocation(LLSLURL& slurl);
- static void setLocation(const LLSLURL& slurl);
-
- static void updateLocationCombo(bool force_visible); // simply update the combo box
+ static void getLocation(std::string &location);
+
static void closePanel();
void setSiteIsAlive( bool alive );
@@ -84,10 +86,10 @@ 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);
- static void updateServer(); // update the combo box, change the login page to the new server, clear the combo
private:
friend class LLPanelLoginListener;
@@ -101,10 +103,6 @@ private:
static void onPassKey(LLLineEditor* caller, void* user_data);
static void onSelectServer(LLUICtrl*, void*);
static void onServerComboLostFocus(LLFocusableElement*);
- static void updateServerCombo();
- static void onSelectLocation(LLUICtrl*, void*);
-
- static void updateLoginPanelLinks();
private:
LLPointer<LLUIImage> mLogoImage;
@@ -113,7 +111,8 @@ private:
void (*mCallback)(S32 option, void *userdata);
void* mCallbackData;
- BOOL mPasswordModified;
+ std::string mIncomingPassword;
+ std::string mMungedPassword;
static LLPanelLogin* sInstance;
static BOOL sCapslockDidNotification;