diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-05-21 08:15:28 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-05-21 08:15:28 -0400 |
| commit | f47ceb47bbcfd3466813d1653992e1ea418964b5 (patch) | |
| tree | f3b1c26e835c8ddf40587783095a8b8954717d7b /indra/newview/llfloaterpreference.cpp | |
| parent | c2ef3b4c7186dbbd95b16520f281b7d58364fb52 (diff) | |
| parent | a46fdc10c76ebbf76b4976f0cbb36b649fe4fdd2 (diff) | |
merged jelly-doll viewer-release into bento
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
| -rw-r--r-- | indra/newview/llfloaterpreference.cpp | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 36bdcf4d89..8429be2f49 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -364,6 +364,7 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key) mCommitCallbackRegistrar.add("Pref.AvatarImpostorsEnable", boost::bind(&LLFloaterPreference::onAvatarImpostorsEnable, this)); mCommitCallbackRegistrar.add("Pref.UpdateIndirectMaxComplexity", boost::bind(&LLFloaterPreference::updateMaxComplexity, this)); mCommitCallbackRegistrar.add("Pref.VertexShaderEnable", boost::bind(&LLFloaterPreference::onVertexShaderEnable, this)); + mCommitCallbackRegistrar.add("Pref.EnhancedSkeletonEnable", boost::bind(&LLFloaterPreference::onEnhancedSkeletonEnable, this, _1)); mCommitCallbackRegistrar.add("Pref.WindowedMod", boost::bind(&LLFloaterPreference::onCommitWindowedMode, this)); mCommitCallbackRegistrar.add("Pref.UpdateSliderText", boost::bind(&LLFloaterPreference::refreshUI,this)); mCommitCallbackRegistrar.add("Pref.QualityPerformance", boost::bind(&LLFloaterPreference::onChangeQuality, this, _2)); @@ -807,6 +808,16 @@ void LLFloaterPreference::onAvatarImpostorsEnable() refreshEnabledGraphics(); } +void LLFloaterPreference::onEnhancedSkeletonEnable(LLUICtrl *ctrl) +{ + bool enabled = ctrl->getValue().asBoolean(); + bool curr_enabled = gSavedSettings.getBOOL("IncludeEnhancedSkeleton"); + if (enabled != curr_enabled) + { + gSavedSettings.setBOOL("IncludeEnhancedSkeleton",enabled); + } +} + //static void LLFloaterPreference::initDoNotDisturbResponse() { @@ -1251,6 +1262,10 @@ void LLFloaterPreferenceGraphicsAdvanced::refreshEnabledState() bool bumpshiny = gGLManager.mHasCubeMap && LLCubeMap::sUseCubeMaps && LLFeatureManager::getInstance()->isFeatureAvailable("RenderObjectBump"); bumpshiny_ctrl->setEnabled(bumpshiny ? TRUE : FALSE); + LLCheckBoxCtrl* ctrl_enhanced_skel = getChild<LLCheckBoxCtrl>("AvatarEnhancedSkeleton"); + bool enhanced_skel_enabled = gSavedSettings.getBOOL("IncludeEnhancedSkeleton"); + ctrl_enhanced_skel->setValue(enhanced_skel_enabled); + // Avatar Mode // Enable Avatar Shaders LLCheckBoxCtrl* ctrl_avatar_vp = getChild<LLCheckBoxCtrl>("AvatarVertexProgram"); @@ -2004,7 +2019,7 @@ void LLFloaterPreference::onClickAutoReplace() void LLFloaterPreference::onClickSpellChecker() { - LLFloaterReg::showInstance("prefs_spellchecker"); + LLFloaterReg::showInstance("prefs_spellchecker"); } void LLFloaterPreference::onClickAdvanced() |