diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2014-10-03 12:18:15 +0300 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2014-10-03 12:18:15 +0300 |
| commit | 4ffc349b2d5c9f2e1d563b536f8aa09c0d359363 (patch) | |
| tree | cef1ad298e7fb0b34e590fb89e042ab801ed5186 /indra | |
| parent | d4dcae0ac9af5adee85c56b6d55024132272b15c (diff) | |
MAINT-4345 FIXED User names are not retained when switching grids
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/llpanellogin.cpp | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index abdfa89f50..9861d64f9e 100755 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -213,36 +213,12 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect, loadLoginPage(); - // Show last logged in user favorites in "Start at" combo. - addUsersWithFavoritesToUsername(); LLComboBox* username_combo(getChild<LLComboBox>("username_combo")); username_combo->setTextChangedCallback(boost::bind(&LLPanelLogin::addFavoritesToStartLocation, this)); // STEAM-14: When user presses Enter with this field in focus, initiate login username_combo->setCommitCallback(boost::bind(&LLPanelLogin::onClickConnect, this)); } -void LLPanelLogin::addUsersWithFavoritesToUsername() -{ - LLComboBox* combo = getChild<LLComboBox>("username_combo"); - if (!combo) return; - 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"); - LLSD fav_llsd; - llifstream file; - file.open(filename); - if (!file.is_open()) - { - file.open(old_filename); - if (!file.is_open()) return; - } - LLSDSerialize::fromXML(fav_llsd, file); - for (LLSD::map_const_iterator iter = fav_llsd.beginMap(); - iter != fav_llsd.endMap(); ++iter) - { - combo->add(iter->first); - } -} - void LLPanelLogin::addFavoritesToStartLocation() { // Clear the combo. |