From fdbb97602131f23d2b95d4dabcc47e1554b9d9ff Mon Sep 17 00:00:00 2001 From: Beq Date: Sat, 8 Feb 2025 22:13:09 +0000 Subject: [PATCH] FIRE-35138] Fix the over-zealous tab switching when editing materials Thsi actually just disbales the viewer trying to guess what the user intends. Feedback on FIRE-35138 in regards other issues would be useful --- indra/newview/fspanelface.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/indra/newview/fspanelface.cpp b/indra/newview/fspanelface.cpp index 55f54f47ba..5279ab85d4 100644 --- a/indra/newview/fspanelface.cpp +++ b/indra/newview/fspanelface.cpp @@ -1517,14 +1517,7 @@ void FSPanelFace::updateUI(bool force_set_values /*false*/) mTabsPBRMatMedia->enableTabButton( mTabsPBRMatMedia->getIndexForPanel( mTabsPBRMatMedia->getPanelByName("panel_material_type_blinn_phong")), editable ); - if(!has_pbr_material) - { - mTabsPBRMatMedia->selectTabByName("panel_material_type_blinn_phong"); - } - else - { - mTabsPBRMatMedia->selectTabByName("panel_material_type_pbr"); - } + // only turn on auto-adjust button if there is a media renderer and the media is loaded mBtnAlignMedia->setEnabled(editable);