diff options
| author | Roxanne Skelly <roxie@lindenlab.com> | 2024-06-11 23:18:54 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-11 23:18:54 -0700 |
| commit | 0f3c3563b0861e8ea82b201aab8343d99f993bbc (patch) | |
| tree | 7ab124cd4852f2d36bf897090feff5cf29c3ebc7 /indra/llcommon/indra_constants.cpp | |
| parent | 6a00609b0cede78f998971687a756b7fcf826c0f (diff) | |
| parent | ed34782283aa2ae6a7a76c0492a2f9edc6bb3629 (diff) | |
Merge pull request #1726 from secondlife/roxie/webrtc-voice
Merge from main.
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"); |