From 5c6da1c8ee60667f365571aba48c4ac61f42a14c Mon Sep 17 00:00:00 2001 From: Graham Madarasz Date: Wed, 22 May 2013 15:23:10 -0700 Subject: NORSPEC-204 make tex controls act like diffuse map when in media mode --- indra/newview/llpanelface.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llpanelface.cpp') 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: -- cgit v1.2.3