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

MAINT-8120 Account that contains last name Resident cannot see his Favorites on Login Screen

Mnikolenko Productengine 2017-12-22 14:20:25 +02:00
parent d3ef8e02a9
commit 6ea525f6af
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llpanellogin.cpp
View File

@ -299,12 +299,24 @@ void LLPanelLogin::addFavoritesToStartLocation()
// Load favorites into the combo.
std::string user_defined_name = getChild<LLComboBox>("username_combo")->getSimple();
LLStringUtil::toLower(user_defined_name);
std::replace(user_defined_name.begin(), user_defined_name.end(), '.', ' ');
std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "stored_favorites_" + LLGridManager::getInstance()->getGrid() + ".xml");
std::string old_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "stored_favorites.xml");
mUsernameLength = user_defined_name.length();
updateLoginButtons();
std::string::size_type index = user_defined_name.find(' ');
if (index != std::string::npos)
{
std::string username = user_defined_name.substr(0, index);
std::string lastname = user_defined_name.substr(index+1);
if (lastname == "resident")
{
user_defined_name = username;
}
}
LLSD fav_llsd;
llifstream file;
file.open(filename.c_str());