diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-06-11 10:21:19 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-06-11 10:21:19 -0400 |
| commit | 30f4163b7b576d96533b61d9b31243960fb83f2e (patch) | |
| tree | bd5dc1450e08c674a4619d7f16a9a4816005f9c4 /indra/llcommon/indra_constants.cpp | |
| parent | 3d1aac4f5c369e9d402c41f1c790d9015f7c7773 (diff) | |
| parent | f5e2708a0fc4e08d3d0a5dc393bbd4bac09e1c55 (diff) | |
Merge branch 'main' of github.com:secondlife/viewer into lua-bradfix
to pick up Featurettes promotion + Brad's GitHub Windows build workaround.
Diffstat (limited to 'indra/llcommon/indra_constants.cpp')
| -rw-r--r-- | indra/llcommon/indra_constants.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llcommon/indra_constants.cpp b/indra/llcommon/indra_constants.cpp index d24a221671..329dfcbe37 100644 --- a/indra/llcommon/indra_constants.cpp +++ b/indra/llcommon/indra_constants.cpp @@ -89,3 +89,4 @@ const LLUUID IMG_USE_BAKED_AUX1 ("9742065b-19b5-297c-858a-29711d539043"); const LLUUID IMG_USE_BAKED_AUX2 ("03642e83-2bd1-4eb9-34b4-4c47ed586d2d"); const LLUUID IMG_USE_BAKED_AUX3 ("edd51b77-fc10-ce7a-4b3d-011dfc349e4f"); +const LLUUID BLANK_MATERIAL_ASSET_ID ("968cbad0-4dad-d64e-71b5-72bf13ad051a"); |