summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRunitaiLinden <davep@lindenlab.com>2023-05-15 13:49:20 -0500
committerRunitaiLinden <davep@lindenlab.com>2023-05-15 13:49:20 -0500
commita256a18884ae8e4bc6297ca59fbd5936089ad59c (patch)
treec6a5bc6b27315243699c498f48bbeca02af5b78f
parentcdc9852f052d804f8b25564ab7d90eb2b79cddd4 (diff)
SL-19674 Disable "Blinn-Phong" when a PBR material is applied to make it clear that those buttons are inoperable until you remove the PBR material.
-rw-r--r--indra/newview/llpanelface.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index dd3fdf91d9..7d6015f557 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -1534,6 +1534,7 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
getChild<LLUICtrl>("checkbox fullbright")->setValue((S32)(fullbright_flag != 0));
getChildView("checkbox fullbright")->setEnabled(editable && !has_pbr_material);
getChild<LLUICtrl>("checkbox fullbright")->setTentative(!identical_fullbright);
+ getChild<LLComboBox>("combobox matmedia")->setEnabledByValue("Materials", !has_pbr_material);
}
// Repeats per meter