diff options
author | Dave Parks <davep@lindenlab.com> | 2013-06-21 12:51:29 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2013-06-21 12:51:29 -0500 |
commit | 79029149a415a9f32e08d378653199a880d21e65 (patch) | |
tree | 14b6f7d59c66602affd77b6e21f1981b28995fa8 /indra/newview/llfloaterpreference.h | |
parent | 80552a465e9169b7326c346f4685790ea459823a (diff) | |
parent | 8511385a5407181ced7bb226d4054185c597d05e (diff) |
Automated merge with file:///F:%5Cviewer-bear
Diffstat (limited to 'indra/newview/llfloaterpreference.h')
-rwxr-xr-x | indra/newview/llfloaterpreference.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h index 22e80a21cb..cb180f6f1e 100755 --- a/indra/newview/llfloaterpreference.h +++ b/indra/newview/llfloaterpreference.h @@ -154,8 +154,7 @@ public: void onChangeQuality(const LLSD& data); void updateSliderText(LLSliderCtrl* ctrl, LLTextBox* text_box); - void onUpdateSliderText(LLUICtrl* ctrl, const LLSD& name); -// void fractionFromDecimal(F32 decimal_val, S32& numerator, S32& denominator); + void refreshUI(); void onCommitParcelMediaAutoPlayEnable(); void onCommitMediaEnabled(); |