livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-6841 - more removal of the include enhanced skeleton toggle

master
Brad Payne (Vir Linden) 2016-10-21 16:24:25 -04:00
parent a2fd408c9b
commit 00a6adec21
3 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/llfloaterpreference.cpp
View File

@ -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

2
indra/newview/llfloaterpreference.h
View File

@ -117,8 +117,6 @@ protected:
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();

1
indra/newview/llviewercontrol.cpp
View File

@ -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));
}