livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.

Cinders 2012-11-16 16:35:15 -07:00
parent a6df1b36c2
commit 52b341fc56
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llpanellogin.cpp
View File

@ -550,7 +550,8 @@ void LLPanelLogin::setFields(LLPointer<LLCredential> credential)
// grid changed so show new splash screen (possibly)
updateServer();
updateLoginPanelLinks();
sInstance->addFavoritesToStartLocation();
// <FS:CR> 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();
}