diff options
| author | prep <none@none> | 2012-03-13 15:48:24 -0400 |
|---|---|---|
| committer | prep <none@none> | 2012-03-13 15:48:24 -0400 |
| commit | fab57eea612f34ed9d8c8559674ead1760aab42b (patch) | |
| tree | 51394d44e1b89bb75d168464aec539f60f44f8cd /indra/newview/llfloaterpreference.h | |
| parent | 87b414c4934d0d52eef0b323245568bb1e95ec70 (diff) | |
| parent | 00717147d2b832fa3239267edf409f0a1dfcd9fd (diff) | |
pull and merge from viewer-development
Diffstat (limited to 'indra/newview/llfloaterpreference.h')
| -rw-r--r-- | indra/newview/llfloaterpreference.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h index 7ee3294478..ec5994e917 100644 --- a/indra/newview/llfloaterpreference.h +++ b/indra/newview/llfloaterpreference.h @@ -198,15 +198,17 @@ public: virtual void saveSettings(); class Updater; + +protected: + typedef std::map<LLControlVariable*, LLSD> control_values_map_t; + control_values_map_t mSavedValues; + 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; - typedef std::map<std::string, LLColor4> string_color_map_t; string_color_map_t mSavedColors; |