summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorGraham Madarasz (Graham) <graham@lindenlab.com>2013-04-09 09:39:57 -0700
committerGraham Madarasz (Graham) <graham@lindenlab.com>2013-04-09 09:39:57 -0700
commit74712b47dfec67e014a4f7e0aca1bebcd15ea4e7 (patch)
tree69de97ad9232aa6ecb11e8d3fcafd27b931e077b /indra/newview
parentaf44715f9014b56c3f8abe63edcb67e7248f1cd4 (diff)
NORSPEC-84 fix alpha mode UI appearing when coming back from media mode
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llpanelface.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index 7a9087333c..9af4bed918 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -2005,6 +2005,10 @@ void LLPanelFace::onCommitMaterialsMedia(LLUICtrl* ctrl, void* userdata)
self->getChildView("bumpyOffsetU")->setEnabled(texParmsEnable);
self->getChildView("bumpyOffsetV")->setEnabled(texParmsEnable);
self->getChildView("checkbox planar align")->setEnabled(texParmsEnable);
+
+ // Needed to handle transitions to/from media mode
+ // NORSPEC-84
+ updateAlphaControls(ctrl,userdata);
}
// static