diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-04-30 09:40:14 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-04-30 09:40:14 +0800 |
| commit | c0a2498fa1ff074fa29b31bbd63b2ac6f69b38bb (patch) | |
| tree | 0909d51200a3de225f20ebe7d0aa7cb95fb380e1 /indra/newview/lltexturectrl.cpp | |
| parent | 39cc9a1706340d6f84b152593a4d8aaeeaa88b56 (diff) | |
| parent | d9e55c44152064133796bfb08f1da524387c1300 (diff) | |
Merge tag 'Second_Life_Release#d9e55c44-Second_Life_Release#d9e55c4-2025.04' into 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; } |