From d79188dfe4bc06d3f6933ac107ae10be8e2ed09b Mon Sep 17 00:00:00 2001 From: Beq Date: Tue, 10 Jun 2025 11:36:08 +0100 Subject: [PATCH] [FIRE-29517] Fix long freeze when entering mouselook --- indra/newview/llviewerwindow.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index e5fe30c167..9cb532b399 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -7332,11 +7332,17 @@ void LLViewerWindow::setUIVisibility(bool visible) // LLPanelTopInfoBar::getInstance()->setVisible(visible? gSavedSettings.getBOOL("ShowMiniLocationPanel") : false); mStatusBarContainer->setVisible(visible); - // hide utility bar if we are on a skin that uses it, e.g. Vintage - LLView* utilityBarStack = mRootView->findChildView("chat_bar_utility_bar_stack"); - if (utilityBarStack) + // hide utility bar if we are on a skin that uses it, i.e. Vintage + // Beq Note: Added a skin check to fix FIRE-29517 "hitch when entering mouselook" + // This was caused having to search for a non-existent childview. If another skin other than vintage + // ever needs chat_bar_utility_bar_stack in the future, this will need to be updated. + if (gSavedSettings.getString("FSInternalSkinCurrent") == "Vintage") { - utilityBarStack->setVisible(visible); + LLView* utilityBarStack = mRootView->findChildView("chat_bar_utility_bar_stack"); + if (utilityBarStack) + { + utilityBarStack->setVisible(visible); + } } // }