diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-05-22 15:23:10 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-05-22 15:23:10 -0700 |
| commit | 5c6da1c8ee60667f365571aba48c4ac61f42a14c (patch) | |
| tree | 00cfce3ca63ea44ee1d419841e0ff06387453e37 /indra/newview | |
| parent | b3000136b852694a057c6e3c1d5b2e8e36f7c5e5 (diff) | |
NORSPEC-204 make tex controls act like diffuse map when in media mode
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llpanelface.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index 8d77aae9ec..49750c8c19 100755 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -1538,7 +1538,7 @@ void LLPanelFace::updateUI() BOOL identical = true; F32 repeats = 1.0f; - U32 material_type = combobox_mattype->getCurrentIndex(); + U32 material_type = (combobox_matmedia->getCurrentIndex() == MATMEDIA_MATERIAL) ? combobox_mattype->getCurrentIndex() : MATTYPE_DIFFUSE; switch (material_type) { default: |