From 42f4c816b735bc41f16ceea8861677d1b4f0e51c Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Fri, 22 Mar 2019 03:57:58 -0400 Subject: [PATCH] [Animesh] Restore Quick Settings Hover Slider responsiveness --- indra/newview/wlfPanel_AdvSettings.cpp | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/indra/newview/wlfPanel_AdvSettings.cpp b/indra/newview/wlfPanel_AdvSettings.cpp index 0952c00da..166355d8d 100644 --- a/indra/newview/wlfPanel_AdvSettings.cpp +++ b/indra/newview/wlfPanel_AdvSettings.cpp @@ -421,10 +421,7 @@ void wlfPanel_AdvSettings::updateTimeSlider() { F32 val = LLWLParamManager::getInstance()->mAnimator.getDayTime() - 0.25f; - if(val < 0.0) - { - val++; - } + if (val < 0.0) ++val; mTimeSlider->setValue(val); } @@ -437,8 +434,8 @@ void syncFromPreferenceSetting(LLSliderCtrl* sldrCtrl) if (isAgentAvatarValid()) { - LLVector3 offset(0.0, 0.0, llclamp(value,MIN_HOVER_Z,MAX_HOVER_Z)); - LL_INFOS("Avatar") << "setting hover from preference setting " << offset[2] << LL_ENDL; + const auto hover = llclamp(value,MIN_HOVER_Z,MAX_HOVER_Z); + LL_INFOS("Avatar") << "setting hover from preference setting " << hover << LL_ENDL; gAgentAvatarp->setHoverIfRegionEnabled(); } } @@ -446,9 +443,9 @@ void syncFromPreferenceSetting(LLSliderCtrl* sldrCtrl) void onHoverSliderMoved(const LLSD& val) { F32 value = val.asFloat(); - LLVector3 offset(0.0, 0.0, llclamp(value,MIN_HOVER_Z,MAX_HOVER_Z)); - LL_INFOS("Avatar") << "setting hover from slider moved" << offset[2] << LL_ENDL; - gAgentAvatarp->setHoverIfRegionEnabled(); + const auto hover = llclamp(value,MIN_HOVER_Z,MAX_HOVER_Z); + LL_DEBUGS("Avatar") << "setting hover from slider moved" << hover << LL_ENDL; + gAgentAvatarp->setHoverOffset(LLVector3(0.0, 0.0, hover), false); } bool sInwlfPanelUpdate = false; @@ -461,8 +458,8 @@ void onHoverSliderFinalCommit(const LLSD& val) F32 value = val.asFloat(); gSavedPerAccountSettings.setF32("AvatarHoverOffsetZ", value); - LLVector3 offset(0.0, 0.0, llclamp(value,MIN_HOVER_Z,MAX_HOVER_Z)); - LL_INFOS("Avatar") << "setting hover from slider final commit " << offset[2] << LL_ENDL; + const auto hover = llclamp(value,MIN_HOVER_Z,MAX_HOVER_Z); + LL_INFOS("Avatar") << "setting hover from slider final commit " << hover << LL_ENDL; gAgentAvatarp->setHoverIfRegionEnabled(); // will send update this time. sInwlfPanelUpdate = false; }