Support username logins on Linden grids. Seems to cover most edge cases with our current grid manager, but really exposes the weaknesses of not saving login info with the grid, usability-wise. (Note: autologin and the command line need to be tested)

1 files changed, 16 insertions, 4 deletions

diff --git a/linden/indra/newview/llpanellogin.h b/linden/indra/newview/llpanellogin.h
index 5830b52..947aea6 100644
--- a/linden/indra/newview/llpanellogin.h
+++ b/linden/indra/newview/llpanellogin.h
@@ -59,9 +59,9 @@ 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);
+        // Sets the login screen's name and password editors. 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(const std::string& username, const std::string& password);
 
         static void addServer(const std::string& server);
         static void refreshLocation( bool force_visible );
@@ -78,6 +78,7 @@ public:
 
         void setSiteIsAlive( bool alive );
 
+        static void loadLoginForm();
         static void loadLoginPage();    
         static void refreshLoginPage();
         static void giveFocus();
@@ -101,8 +102,19 @@ private:
         static void onPassKey(LLLineEditor* caller, void* user_data);
         static void onSelectServer(LLUICtrl*, void*);
         static void onServerComboLostFocus(LLFocusableElement*, void*);
+
+        // converts the following login name formats into valid firstname lastname combos:
+        // username
+        // username.Resident
+        // first.last
+        // first+" "+last
+        // "     "+first+"    "+last+"     "
+        // returns true if name conversion successful
+        static bool convertUsernameToLegacy(std::string& username, std::string& firstname, std::string& lastname);
+
+        // set the password for the login screen
+        static void setPassword(const std::string& password);
         
-private:
         LLPointer<LLUIImage> mLogoImage;
 
         void                    (*mCallback)(S32 option, void *userdata);