diff options
author | Oz Linden <oz@lindenlab.com> | 2011-08-25 09:27:34 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-08-25 09:27:34 -0400 |
commit | e6239b7978fb9f05d2c8c7cf42b9277f4a5f7c52 (patch) | |
tree | 17080b4ffa8a59a5b9c158edaf9e60f9af2a67b4 /indra/newview/llfloaterpreference.h | |
parent | 66cac05cfb1236c3c1607dff27babf873c29a679 (diff) | |
parent | 6484dbf28cb8b6ffa745fe9b26beae58d3c68441 (diff) |
merge changes for storm-1571
Diffstat (limited to 'indra/newview/llfloaterpreference.h')
-rw-r--r-- | indra/newview/llfloaterpreference.h | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h index 61f2c78640..ef9bc2dd53 100644 --- a/indra/newview/llfloaterpreference.h +++ b/indra/newview/llfloaterpreference.h @@ -156,6 +156,7 @@ public: void applyResolution(); void onChangeMaturity(); void onClickBlockList(); + void onClickProxySettings(); void applyUIColor(LLUICtrl* ctrl, const LLSD& param); void getUIColor(LLUICtrl* ctrl, const LLSD& param); @@ -229,4 +230,33 @@ protected: }; +class LLFloaterPreferenceProxy : public LLFloater +{ +public: + LLFloaterPreferenceProxy(const LLSD& key); + ~LLFloaterPreferenceProxy(); + + /// show off our menu + static void show(); + void cancel(); + +protected: + BOOL postBuild(); + void onOpen(const LLSD& key); + void onClose(bool app_quitting); + void saveSettings(); + void onBtnOk(); + void onBtnCancel(); + + void onChangeSocksSettings(); + +private: + + bool mSocksSettingsDirty; + typedef std::map<LLControlVariable*, LLSD> control_values_map_t; + control_values_map_t mSavedValues; + +}; + + #endif // LL_LLPREFERENCEFLOATER_H |