Merge remote-tracking branch 'imprudence/exp' into exp

Conflicts (for future reference):
	linden/indra/llcommon/llstring.cpp
	linden/indra/newview/llpanelnetwork.cpp
	linden/indra/newview/llselectmgr.cpp
	linden/indra/newview/llstartup.cpp
	linden/indra/newview/lltoolmgr.cpp
	linden/indra/newview/llvoavatar.cpp

1 files changed, 2 insertions, 3 deletions

diff --git a/linden/indra/newview/llpanellogin.h b/linden/indra/newview/llpanellogin.h
index d077f32..4d79750 100644
--- a/linden/indra/newview/llpanellogin.h
+++ b/linden/indra/newview/llpanellogin.h
@@ -83,7 +83,6 @@ public:
         static void refreshLoginPage();
         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);
@@ -95,6 +94,7 @@ private:
         static bool newAccountAlertCallback(const LLSD& notification, const LLSD& response);
         static void onClickQuit(void*);
         static void onClickVersion(void*);
+        static void onPasswordChanged(LLUICtrl* caller, void* user_data);
         static void onClickForgotPassword(void*);
         static void onPassKey(LLLineEditor* caller, void* user_data);
         static void onSelectServer(LLUICtrl*, void*);
@@ -117,8 +117,7 @@ private:
         void                    (*mCallback)(S32 option, void *userdata);
         void*                   mCallbackData;
 
-        std::string mIncomingPassword;
-        std::string mMungedPassword;
+        std::string mActualPassword;
 
         static LLPanelLogin* sInstance;
         static BOOL             sCapslockDidNotification;