diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2015-11-30 11:59:30 +0200 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2015-11-30 11:59:30 +0200 |
| commit | 1f17b5c8c30b5bc7f6f40fd4490f5283cc8e0c53 (patch) | |
| tree | d8a25a0ebe94ea3bd794d2627272a737345133cf | |
| parent | e6b3063fd25dfad8a5df6b8859b6af7a67ea1079 (diff) | |
MAINT-5760 Favorites should be saved if you log-in after cleaning settings and logout without any changes to favorites.
| -rwxr-xr-x | indra/newview/llfavoritesbar.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp index d6b86cd746..8d48ce69ea 100755 --- a/indra/newview/llfavoritesbar.cpp +++ b/indra/newview/llfavoritesbar.cpp @@ -969,6 +969,7 @@ BOOL LLFavoritesBarCtrl::collectFavoriteItems(LLInventoryModel::item_array_t &it { LLFavoritesOrderStorage::instance().setSortIndex((*i), ++sortField); } + LLFavoritesOrderStorage::instance().mSaveOnExit = true; } return TRUE; @@ -1530,10 +1531,10 @@ void LLFavoritesOrderStorage::destroyClass() { file.close(); LLFile::remove(filename); - if(mSaveOnExit) - { - LLFavoritesOrderStorage::instance().saveFavoritesRecord(true); - } + } + if(mSaveOnExit) + { + LLFavoritesOrderStorage::instance().saveFavoritesRecord(true); } } |