diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-25 11:08:07 +0000 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-25 11:08:07 +0000 |
commit | 1beaa01f57787f08e960c348010b5dedcecbb738 (patch) | |
tree | 3c8abf5be4bda150696e358fb7c4e3077514bac0 /indra/newview/llfloaterpreference.h | |
parent | 0faa004aa11cca9b60dfe8c176a0f407e880d809 (diff) | |
parent | c4277e421ca8934e405d778f3c86f21760c55c9d (diff) |
PE merge.
Diffstat (limited to 'indra/newview/llfloaterpreference.h')
-rw-r--r-- | indra/newview/llfloaterpreference.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h index 93b39d72bc..71aa5d3189 100644 --- a/indra/newview/llfloaterpreference.h +++ b/indra/newview/llfloaterpreference.h @@ -134,8 +134,9 @@ public: void onCommitMediaEnabled(); void onCommitMusicEnabled(); void applyResolution(); + void onChangeMaturity(); void applyUIColor(LLUICtrl* ctrl, const LLSD& param); - void getUIColor(LLUICtrl* ctrl, const LLSD& param); + void getUIColor(LLUICtrl* ctrl, const LLSD& param); void buildPopupLists(); static void refreshSkin(void* data); |