diff options
Diffstat (limited to 'indra/newview/llfloaterpreference.h')
| -rw-r--r-- | indra/newview/llfloaterpreference.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h index afff610c69..ce31abcd9e 100644 --- a/indra/newview/llfloaterpreference.h +++ b/indra/newview/llfloaterpreference.h @@ -72,7 +72,6 @@ public: /*virtual*/ void draw(); virtual BOOL postBuild(); virtual void onOpen(const LLSD& key); - virtual void onClose(bool app_quitting); // static data update, called from message handler static void updateUserInfo(const std::string& visibility, bool im_via_email, const std::string& email); @@ -82,13 +81,15 @@ public: protected: + void onClose(); + void onBtnOK(); void onBtnCancel(); void onBtnApply(); void onOpenHelp(); - static void onClickClearCache(void*); - static void onClickBrowserClearCache(void*); +// void onClickClearCache(); + void onClickBrowserClearCache(); // if the custom settings box is clicked void onChangeCustom(); @@ -112,6 +113,7 @@ public: void onClickSkipDialogs(); void onClickResetDialogs(); void onClickEnablePopup(); + void onClickDisablePopup(); void resetAllIgnored(); void setAllIgnored(); void onClickLogPath(); @@ -163,6 +165,9 @@ public: private: 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; }; #endif // LL_LLPREFERENCEFLOATER_H |