diff options
author | Loren Shih <seraph@lindenlab.com> | 2011-01-10 11:20:39 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2011-01-10 11:20:39 -0500 |
commit | fdf19a526821291bd3d6a6e1f6b78dcaeac63705 (patch) | |
tree | 840aacb00347dade197ad74862fdec9be513749d /indra/newview/llfloaterpreference.h | |
parent | c4989c17ed3848f676364e1927ccad13fb628e2c (diff) | |
parent | 964e981458234aed37252a7b484f6f6765fff50d (diff) |
Automated merge up from viewer-development
Diffstat (limited to 'indra/newview/llfloaterpreference.h')
-rw-r--r-- | indra/newview/llfloaterpreference.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h index 165de9f42d..784033ae95 100644 --- a/indra/newview/llfloaterpreference.h +++ b/indra/newview/llfloaterpreference.h @@ -159,6 +159,8 @@ public: void buildPopupLists(); static void refreshSkin(void* data); + // Remove record of current user's favorites from file on disk. + void removeFavoritesRecordOfUser(); private: static std::string sSkin; // set true if state of double-click action checkbox or radio-group was changed by user @@ -169,6 +171,8 @@ private: bool mLanguageChanged; bool mOriginalHideOnlineStatus; + // Record of current user's favorites may be stored in file on disk. + bool mFavoritesRecordMayExist; std::string mDirectoryVisibility; LLAvatarData mAvatarProperties; @@ -192,6 +196,8 @@ public: private: //for "Only friends and groups can call or IM me" static void showFriendsOnlyWarning(LLUICtrl*, const LLSD&); + //for "Show my Favorite Landmarks at Login" + static void showFavoritesOnLoginWarning(LLUICtrl* checkbox, const LLSD& value); typedef std::map<LLControlVariable*, LLSD> control_values_map_t; control_values_map_t mSavedValues; |