diff options
Diffstat (limited to 'indra/newview/llpanelface.cpp')
| -rw-r--r-- | indra/newview/llpanelface.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index 43001e7d2c..c8c71b425d 100644 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -1957,8 +1957,16 @@ void LLPanelFace::updateAlphaControls(LLUICtrl* ctrl, void* userdata) { return; } + LLComboBox* comboMaterials = self->getChild<LLComboBox>("combobox mattype"); + if (!comboMaterials) + { + return; + } + U32 alpha_value = comboAlphaMode->getCurrentIndex(); - bool show_alphactrls = (alpha_value == ALPHAMODE_MASK); // Alpha masking + U32 mattype = comboMaterials->getCurrentIndex(); + + bool show_alphactrls = (alpha_value == ALPHAMODE_MASK) && (mattype == 0); // Alpha masking self->getChildView("label maskcutoff")->setVisible(show_alphactrls); self->getChildView("maskcutoff")->setVisible(show_alphactrls); } |