From 012ba25d45e1c0c09090ee11204ee31eceb4b81f Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Tue, 19 Sep 2017 11:15:51 +0300 Subject: MAINT-7811 FIXED The "Use Texture" option appears when it shouldn't be displayed --- indra/newview/llpanelface.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'indra/newview/llpanelface.cpp') diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index a16259886d..f95a83f427 100644 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -1623,6 +1623,15 @@ void LLPanelFace::updateShinyControls(bool is_setting_texture, bool mess_with_sh } } } + else + { + if (shiny_texture_ID.isNull() && comboShiny && comboShiny->itemExists(USE_TEXTURE)) + { + comboShiny->remove(SHINY_TEXTURE); + comboShiny->selectFirstItem(); + } + } + LLComboBox* combo_matmedia = getChild("combobox matmedia"); LLRadioGroup* radio_mat_type = getChild("radio_material_type"); -- cgit v1.2.3 From 788d74507139e6db7037daff619b188264fc2401 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Fri, 13 Oct 2017 12:23:08 +0300 Subject: MAINT-7899 FIXED Apparent broken material texture selection --- indra/newview/llpanelface.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llpanelface.cpp') diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index f95a83f427..7e75dca908 100644 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -2377,8 +2377,8 @@ void LLPanelFace::onCommitPlanarAlign(LLUICtrl* ctrl, void* userdata) void LLPanelFace::onTextureSelectionChanged(LLInventoryItem* itemp) { LL_DEBUGS("Materials") << "item asset " << itemp->getAssetUUID() << LL_ENDL; - LLRadioGroup* radio_mat_type = getChild("radio_material_type"); - if(radio_mat_type) + LLRadioGroup* radio_mat_type = findChild("radio_material_type"); + if(!radio_mat_type) { return; } -- cgit v1.2.3