diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2017-09-19 11:15:51 +0300 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2017-09-19 11:15:51 +0300 |
| commit | 012ba25d45e1c0c09090ee11204ee31eceb4b81f (patch) | |
| tree | 4c1e4aeccbe967102313ba94bd35aff4898697f0 | |
| parent | 18483e902c0c821dc5d0bb8349f83d1a3b34d5a8 (diff) | |
MAINT-7811 FIXED The "Use Texture" option appears when it shouldn't be displayed
| -rw-r--r-- | indra/newview/llpanelface.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
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<LLComboBox>("combobox matmedia"); LLRadioGroup* radio_mat_type = getChild<LLRadioGroup>("radio_material_type"); |