diff options
author | Oz Linden <oz@lindenlab.com> | 2012-06-21 14:19:25 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-06-21 14:19:25 -0400 |
commit | f64a79d9d14fe52dc9ac599bc9e4faf8009254ce (patch) | |
tree | d14ff8f9cf8bd723b8d479446f47eeb4211e8326 /indra/newview/llfloaterpreference.cpp | |
parent | ee130adc60dea8530f82d90107198ebcbd63fded (diff) | |
parent | 4539e5c8e93badc83e71045ba87ef81bf8740cab (diff) |
merge changes for DRTVWR-171
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
-rwxr-xr-x | indra/newview/llfloaterpreference.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 173b0e538c..d6f5be9aae 100755 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -435,6 +435,8 @@ BOOL LLFloaterPreference::postBuild() gSavedSettings.getControl("ChatBubbleOpacity")->getSignal()->connect(boost::bind(&LLFloaterPreference::onNameTagOpacityChange, this, _2)); + gSavedSettings.getControl("PreferredMaturity")->getSignal()->connect(boost::bind(&LLFloaterPreference::onChangeMaturity, this)); + LLTabContainer* tabcontainer = getChild<LLTabContainer>("pref core"); if (!tabcontainer->selectTab(gSavedSettings.getS32("LastPrefTab"))) tabcontainer->selectFirstTab(); |