diff options
| author | angela <angela@lindenlab.com> | 2010-02-26 16:02:33 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2010-02-26 16:02:33 +0800 |
| commit | 75e5441f2da7252749174db70719a78637bc4eeb (patch) | |
| tree | 09f6019e2b8a9c467b884ff9e7a2ed03c7e7a2a5 /indra/newview/llfloaterpreference.h | |
| parent | e2b347c235e5fb92ef9941be57e049df4bf34168 (diff) | |
| parent | 9f079954af9ca80498bf6953d65cc7e77e956f26 (diff) | |
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); |