diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-05-08 10:18:03 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-05-08 10:18:03 -0700 |
| commit | 60f602d5e12a50623b51b13e097992f79006823f (patch) | |
| tree | 386e3cf5b25f3292e3ba7c8a9b0524c5bfbb9589 /indra/newview/llfloaterpreference.h | |
| parent | 29da931051202a10ea71db56e47acecae1603a5d (diff) | |
| parent | ccb86a2a6675b21dda6267d4a850e5a09acbafa4 (diff) | |
Pull from VirLinden/drano
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; |