From 04e7412d72e597d8eddbd1a4ea478c75565bb0f5 Mon Sep 17 00:00:00 2001 From: Angeldark Raymaker Date: Thu, 14 Nov 2024 19:46:20 +0000 Subject: [PATCH] FIRE-34747: More review fixes --- indra/newview/fsfloaterposer.cpp | 16 +++------------- indra/newview/fsfloaterposer.h | 2 -- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/indra/newview/fsfloaterposer.cpp b/indra/newview/fsfloaterposer.cpp index 01fc77044d..23e34adf3b 100644 --- a/indra/newview/fsfloaterposer.cpp +++ b/indra/newview/fsfloaterposer.cpp @@ -156,12 +156,8 @@ bool FSFloaterPoser::postBuild() mPosesScrollList->setCommitCallback([this](LLUICtrl *, const LLSD &) { onPoseFileSelect(); }); mToggleAdvancedPanelBtn = getChild("toggleAdvancedPanel"); - - mStopPosingOnCloseCbx = getChild("stop_posing_on_close_checkbox"); - if (gSavedSettings.getBOOL(POSER_STOPPOSINGWHENCLOSED_SAVE_KEY)) - mStopPosingOnCloseCbx->set(true); - - mResetBaseRotOnEditCbx = getChild("reset_base_rotation_on_edit_checkbox"); + if (gSavedSettings.getBOOL(POSER_ADVANCEDWINDOWSTATE_SAVE_KEY)) + mToggleAdvancedPanelBtn->setValue(true); mTrackpadSensitivitySlider = getChild("trackpad_sensitivity_slider"); mTrackpadSensitivitySlider->setValue(gSavedSettings.getF32(POSER_TRACKPAD_SENSITIVITY_SAVE_KEY)); @@ -2126,10 +2122,4 @@ void FSFloaterPoser::addBoldToScrollList(LLScrollListCtrl* list, LLVOAvatar* ava } } -bool FSFloaterPoser::getWhetherToResetBaseRotationOnEdit() -{ - if (!mResetBaseRotOnEditCbx) - return false; - - return mResetBaseRotOnEditCbx->getValue().asBoolean(); -} +bool FSFloaterPoser::getWhetherToResetBaseRotationOnEdit() { return gSavedSettings.getBOOL(POSER_RESETBASEROTONEDIT_SAVE_KEY); } diff --git a/indra/newview/fsfloaterposer.h b/indra/newview/fsfloaterposer.h index e2b0f43ccd..ab20071128 100644 --- a/indra/newview/fsfloaterposer.h +++ b/indra/newview/fsfloaterposer.h @@ -412,8 +412,6 @@ class FSFloaterPoser : public LLFloater LLPanel* mMiscJointsPnl{ nullptr }; LLPanel* mCollisionVolumesPnl{ nullptr }; LLPanel* mPosesLoadSavePnl{ nullptr }; - LLCheckBoxCtrl* mStopPosingOnCloseCbx{ nullptr }; - LLCheckBoxCtrl* mResetBaseRotOnEditCbx{ nullptr }; }; #endif