From 00a6adec211b5a568ac1cbe6ff7e35458da63bfc Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Fri, 21 Oct 2016 16:24:25 -0400
Subject: [PATCH] MAINT-6841 - more removal of the include enhanced skeleton
toggle
---
indra/newview/llfloaterpreference.cpp | 15 ---------------
indra/newview/llfloaterpreference.h | 2 --
indra/newview/llviewercontrol.cpp | 1 -
3 files changed, 18 deletions(-)
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 8429be2f498..853224b5044 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -364,7 +364,6 @@ 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));
@@ -808,16 +807,6 @@ 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()
{
@@ -1261,10 +1250,6 @@ void LLFloaterPreferenceGraphicsAdvanced::refreshEnabledState()
LLCheckBoxCtrl* bumpshiny_ctrl = getChild<LLCheckBoxCtrl>("BumpShiny");
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
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h
index fd45129c725..fa0c09e97a7 100644
--- a/indra/newview/llfloaterpreference.h
+++ b/indra/newview/llfloaterpreference.h
@@ -117,8 +117,6 @@ class LLFloaterPreference : public LLFloater, public LLAvatarPropertiesObserver,
void onVertexShaderEnable();
// callback for when client turns on impostors
void onAvatarImpostorsEnable();
- // callback for when enhanced skeleton support checkbox toggled.
- void onEnhancedSkeletonEnable(LLUICtrl *ctrl);
// callback for commit in the "Single click on land" and "Double click on land" comboboxes.
void onClickActionChange();
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index f2680ce25db..d36377acffc 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -755,7 +755,6 @@ void settings_setup_listeners()
gSavedSettings.getControl("SpellCheck")->getSignal()->connect(boost::bind(&handleSpellCheckChanged));
gSavedSettings.getControl("SpellCheckDictionary")->getSignal()->connect(boost::bind(&handleSpellCheckChanged));
gSavedSettings.getControl("LoginLocation")->getSignal()->connect(boost::bind(&handleLoginLocationChanged));
- gSavedSettings.getControl("IncludeEnhancedSkeleton")->getCommitSignal()->connect(boost::bind(&handleDeferredDebugSettingChanged, _2));
gSavedSettings.getControl("DebugAvatarJoints")->getCommitSignal()->connect(boost::bind(&handleDebugAvatarJointsChanged, _2));
}
--
GitLab