diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-11-10 14:16:34 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-11-10 14:16:34 -0600 |
| commit | 12a86f89e5345569d5cc36941ec7774fe54af298 (patch) | |
| tree | 605d9f5efdbab6a681322eede742ada5c9534868 /indra/newview | |
| parent | e2cf375179b807b847414206bf79617e4e9889ae (diff) | |
SL-18617 Disable fullbright checkbox and color swatch when GLTF material is present.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llpanelface.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index e2ff29039d..0cadfb3eee 100644 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -997,9 +997,9 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/) color_swatch->setOriginal(color); color_swatch->set(color, force_set_values || (prev_color != color) || !editable); - color_swatch->setValid(editable); - color_swatch->setEnabled( editable ); - color_swatch->setCanApplyImmediately( editable ); + color_swatch->setValid(editable && !has_pbr_material); + color_swatch->setEnabled( editable && !has_pbr_material); + color_swatch->setCanApplyImmediately( editable && !has_pbr_material); } // Color transparency @@ -1501,7 +1501,7 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/) LLSelectedTE::getFullbright(fullbright_flag,identical_fullbright); getChild<LLUICtrl>("checkbox fullbright")->setValue((S32)(fullbright_flag != 0)); - getChildView("checkbox fullbright")->setEnabled(editable); + getChildView("checkbox fullbright")->setEnabled(editable && !has_pbr_material); getChild<LLUICtrl>("checkbox fullbright")->setTentative(!identical_fullbright); } |