diff options
author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2021-09-24 15:28:25 +0300 |
---|---|---|
committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2021-09-24 15:28:25 +0300 |
commit | f3a43c74f9e5aae506814af2460507b6879a9bd5 (patch) | |
tree | eceec5302d54d95db3398508bf68a153c7e6d59a /indra/newview/llfavoritesbar.h | |
parent | 1c3d2876ac2b5212976bde9cd4fdea485a366ab9 (diff) |
SL-16063 FIXED The favorite landmark does not change after editing from another machine
Diffstat (limited to 'indra/newview/llfavoritesbar.h')
-rw-r--r-- | indra/newview/llfavoritesbar.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llfavoritesbar.h b/indra/newview/llfavoritesbar.h index 3bb940948b..ad315b7dc7 100644 --- a/indra/newview/llfavoritesbar.h +++ b/indra/newview/llfavoritesbar.h @@ -226,8 +226,11 @@ public: BOOL saveFavoritesRecord(bool pref_changed = false); void showFavoritesOnLoginChanged(BOOL show); - LLInventoryModel::item_array_t mPrevFavorites; + bool isStorageUpdateNeeded(); + LLInventoryModel::item_array_t mPrevFavorites; + LLSD mStorageFavorites; + bool mRecreateFavoriteStorage; const static S32 NO_INDEX; static bool mSaveOnExit; @@ -254,7 +257,6 @@ private: slurls_map_t mSLURLs; std::set<LLUUID> mMissingSLURLs; bool mIsDirty; - bool mRecreateFavoriteStorage; struct IsNotInFavorites { |