From 3e56de13a7ec13cc8331bc21bc63d6fc62f3f4e6 Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Thu, 8 Feb 2018 18:11:45 +0200 Subject: MAINT-8275 FIXED "Walk/run/fly" toolbar button turns off "fly mode" of avatar when the user log in --- indra/newview/llmoveview.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'indra/newview/llmoveview.cpp') diff --git a/indra/newview/llmoveview.cpp b/indra/newview/llmoveview.cpp index 4999318973..c03080beb8 100644 --- a/indra/newview/llmoveview.cpp +++ b/indra/newview/llmoveview.cpp @@ -400,12 +400,12 @@ void LLFloaterMove::initMovementMode() { initMovementMode = MM_FLY; } - setMovementMode(initMovementMode); + + mCurrentMode = initMovementMode; + bool hide_mode_buttons = (MM_FLY == mCurrentMode) || (isAgentAvatarValid() && gAgentAvatarp->isSitting()); - if (isAgentAvatarValid()) - { - showModeButtons(!gAgentAvatarp->isSitting()); - } + updateButtonsWithMovementMode(mCurrentMode); + showModeButtons(!hide_mode_buttons); } void LLFloaterMove::setModeTooltip(const EMovementMode mode) -- cgit v1.2.3 From 66502df0502f1c2aa6aa9fda0a2a61921535a645 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Fri, 20 Apr 2018 20:21:20 +0300 Subject: MAINT-8540 Eliminated a lot of xui related log warnings on startup and opening preferences --- indra/newview/llmoveview.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llmoveview.cpp') diff --git a/indra/newview/llmoveview.cpp b/indra/newview/llmoveview.cpp index c03080beb8..301487b994 100644 --- a/indra/newview/llmoveview.cpp +++ b/indra/newview/llmoveview.cpp @@ -716,9 +716,9 @@ void LLPanelStandStopFlying::updatePosition() left_tb_width = toolbar_left->getRect().getWidth(); } - if (!mStateManagementButtons.get()) + if (!mStateManagementButtons.get()) // Obsolete?!! { - LLPanel* panel_ssf_container = getRootView()->getChild("state_management_buttons_container"); + LLPanel* panel_ssf_container = gToolBarView->getChild("state_management_buttons_container"); if (panel_ssf_container) { mStateManagementButtons = panel_ssf_container->getHandle(); -- cgit v1.2.3