diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-05-31 09:33:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-31 09:33:42 -0400 |
| commit | c88f5d26dc894f8d82b948c387a9a3b70862731b (patch) | |
| tree | fd96237f2a595396cd4a2861f976483ea8ef1544 /indra/newview/lltexturectrl.cpp | |
| parent | aeefc73129978f6f2c1ba8caaff2750eff2cfbb3 (diff) | |
| parent | 39625d10b8a50ed4ca91d618d6ad638b99087e35 (diff) | |
Merge pull request #4176 from secondlife/geenz/2025.04-to-develop
Merge 2025.04 into develop
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; } |