diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-05-28 11:36:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-28 11:36:40 -0400 |
| commit | de8275b14b30bf754cdba1da867cb2e6c2783639 (patch) | |
| tree | 77022d8d0348d5e99f54966193746fb1472d7ce2 /indra/newview/lltexturectrl.cpp | |
| parent | cf2b4dbfb280986cf859b12fd55158d7b9e0ac3d (diff) | |
| parent | fe55c7815cde70c046467edfb651659af056cefc (diff) | |
Merge pull request #3861 from secondlife/release/2025.04
Release/2025.04
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
| -rw-r--r-- | indra/newview/lltexturectrl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index 35057a910a..20127f5f27 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -88,7 +88,8 @@ bool get_is_predefined_texture(LLUUID asset_id) || asset_id == DEFAULT_OBJECT_NORMAL || asset_id == BLANK_OBJECT_NORMAL || asset_id == IMG_WHITE - || asset_id == LLUUID(SCULPT_DEFAULT_TEXTURE)) + || asset_id == LLUUID(SCULPT_DEFAULT_TEXTURE) + || asset_id == BLANK_MATERIAL_ASSET_ID) { return true; } |