diff options
| author | Runitai Linden <davep@lindenlab.com> | 2022-01-25 13:36:53 -0600 |
|---|---|---|
| committer | Runitai Linden <davep@lindenlab.com> | 2022-01-25 13:36:53 -0600 |
| commit | 817f764edc6d71727300bfaba533821a8d428950 (patch) | |
| tree | ab6b87ffa47e42f9e8913194276f9988b4d2a590 /indra/newview/llfloaterpreference.cpp | |
| parent | 7254795a77a78644eb8ec35cfa0a1af9cae4c3bc (diff) | |
| parent | b50de181623874ab799fdc31532dffe8f7bc610a (diff) | |
Merge branch 'DRTVWR-539' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-539
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
| -rw-r--r-- | indra/newview/llfloaterpreference.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index b655a04b14..41ae39152b 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -304,7 +304,7 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key) mCommitCallbackRegistrar.add("Pref.RememberedUsernames", boost::bind(&LLFloaterPreference::onClickRememberedUsernames, this)); mCommitCallbackRegistrar.add("Pref.SpellChecker", boost::bind(&LLFloaterPreference::onClickSpellChecker, this)); mCommitCallbackRegistrar.add("Pref.Advanced", boost::bind(&LLFloaterPreference::onClickAdvanced, this)); - mCommitCallbackRegistrar.add("Pref.MouseDown", boost::bind(&LLFloaterPreference::onUICtrlMouseDown, this)); + mCommitCallbackRegistrar.add("Pref.AutoAdjustWarning", boost::bind(&LLFloaterPreference::showAutoAdjustWarning)); sSkin = gSavedSettings.getString("SkinCurrent"); @@ -1783,7 +1783,7 @@ void LLFloaterPreference::updateSearchableItems() mSearchDataDirty = true; } -void LLFloaterPreference::onUICtrlMouseDown() +void LLFloaterPreference::showAutoAdjustWarning() { static LLCachedControl<bool> use_auto_adjust(gSavedSettings,"AutoFPS"); if (use_auto_adjust) |