diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-06-29 20:31:17 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-06-29 20:31:17 +0300 |
| commit | 77ce594dec86eacadb39abf56c69d03b6f421a59 (patch) | |
| tree | 206d5ffc8e7e275929d3dbbe0ef4fd098c8d7ca0 /indra/newview/llfavoritesbar.h | |
| parent | 192e7284aa7275f1b4e37bfd639bf317182bb5e2 (diff) | |
| parent | 1e4f2ec07e32a142f35817d3186a124df3f8cd25 (diff) | |
Merge branch 'master' into DRTVWR-544-maint
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 2d7ba9df67..3b439b31fd 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 { |