diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-06-15 18:20:47 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-15 18:20:47 +0300 |
| commit | 847a8458ecbcefd989a02c727e50f96c606d9d39 (patch) | |
| tree | 1561a55fe1e62356089d4912cd8216cc15b57e09 /indra/llcommon/indra_constants.h | |
| parent | c4fc76efefd12c7cb1224dc8a748da2958f4a7f0 (diff) | |
| parent | bfadb935560003e94197a0c9532a7ba086c6720a (diff) | |
Merge pull request #1774 from secondlife/marchcat/b-merge
Release (Materials featurette) -> Maint B sync
Diffstat (limited to 'indra/llcommon/indra_constants.h')
| -rw-r--r-- | indra/llcommon/indra_constants.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llcommon/indra_constants.h b/indra/llcommon/indra_constants.h index 811313e56e..d2de88ff0a 100644 --- a/indra/llcommon/indra_constants.h +++ b/indra/llcommon/indra_constants.h @@ -236,6 +236,8 @@ LL_COMMON_API extern const LLUUID DEFAULT_OBJECT_SPECULAR; LL_COMMON_API extern const LLUUID DEFAULT_OBJECT_NORMAL; LL_COMMON_API extern const LLUUID BLANK_OBJECT_NORMAL; +LL_COMMON_API extern const LLUUID BLANK_MATERIAL_ASSET_ID; + // radius within which a chat message is fully audible const F32 CHAT_NORMAL_RADIUS = 20.f; |