From 52b341fc5657bf9f81f20dc90c46e7343b2921a9 Mon Sep 17 00:00:00 2001 From: Cinders Date: Fri, 16 Nov 2012 16:35:15 -0700 Subject: [PATCH] Remove redundant addFavoritesToStartLocation that wipes the password right after setting it Trim username credential to clean off whitespace causing multiple insertions of the same user. --- indra/newview/llpanellogin.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index e82ecd6d77..798acfd179 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -550,7 +550,8 @@ void LLPanelLogin::setFields(LLPointer credential) // grid changed so show new splash screen (possibly) updateServer(); updateLoginPanelLinks(); - sInstance->addFavoritesToStartLocation(); + // This is redudant to line 504 and causes the password to be wiped on a saved credential. Remove it. + //sInstance->addFavoritesToStartLocation(); } @@ -1498,6 +1499,7 @@ std::string LLPanelLogin::credential_name() U32 arobase = username.find("@"); if (arobase != std::string::npos && arobase + 1 < username.length()) username = username.substr(0,arobase); + LLStringUtil::trim(username); return username + "@" + LLGridManager::getInstance()->getGrid(); }