diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-05-02 13:05:25 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-05-02 13:05:25 -0700 |
| commit | dd06eb40213d8429b34b5ee90cdb682924e976dc (patch) | |
| tree | 16bf99acad345cf068e12d26e6f154059d980212 /indra/newview | |
| parent | 1a880b47ab7176a78f39a1681f00e2e6a32321ad (diff) | |
NORSPEC-157 make texture repeats/offsets controls display in media mode
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llpanelface.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index 79673fa868..1a3f4832fd 100644 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -1953,11 +1953,11 @@ void LLPanelFace::onCommitMaterialsMedia(LLUICtrl* ctrl, void* userdata) U32 materials_media = combo_matmedia->getCurrentIndex(); U32 material_type = combo_mattype->getCurrentIndex(); bool show_media = (materials_media == MATMEDIA_MEDIA) && combo_matmedia->getEnabled(); - bool show_texture = (!show_media) && (material_type == MATTYPE_DIFFUSE) && combo_matmedia->getEnabled(); + bool show_texture = (show_media || ((material_type == MATTYPE_DIFFUSE) && combo_matmedia->getEnabled())); bool show_bumpiness = (!show_media) && (material_type == MATTYPE_NORMAL) && combo_matmedia->getEnabled(); bool show_shininess = (!show_media) && (material_type == MATTYPE_SPECULAR) && combo_matmedia->getEnabled(); self->getChildView("combobox mattype")->setVisible(!show_media); - self->getChildView("rptctrl")->setVisible(!show_media); + self->getChildView("rptctrl")->setVisible(show_texture); // Media controls self->getChildView("media_info")->setVisible(show_media); @@ -1966,12 +1966,12 @@ void LLPanelFace::onCommitMaterialsMedia(LLUICtrl* ctrl, void* userdata) self->getChildView("button align")->setVisible(show_media); // Diffuse texture controls - self->getChildView("texture control")->setVisible(show_texture); - self->getChildView("label alphamode")->setVisible(show_texture); - self->getChildView("combobox alphamode")->setVisible(show_texture); + self->getChildView("texture control")->setVisible(show_texture && !show_media); + self->getChildView("label alphamode")->setVisible(show_texture && !show_media); + self->getChildView("combobox alphamode")->setVisible(show_texture && !show_media); self->getChildView("label maskcutoff")->setVisible(false); self->getChildView("maskcutoff")->setVisible(false); - if (show_texture) + if (show_texture && !show_media) { updateAlphaControls(ctrl, userdata); } |