diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-08-11 15:36:09 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-08-11 15:36:09 -0400 |
| commit | 6ff420d705625fef4b0456c19bb9c766cabb31af (patch) | |
| tree | 16c27571df04932dd830b35e06cdf4e9b5dbf07e /indra/llcommon/indra_constants.cpp | |
| parent | c32b27f5b77c7d8e53b11163d04f2842949d71de (diff) | |
| parent | 4fb100ac7a33174883184f1320d0beac08ead3a7 (diff) | |
merge changes for 4.0.7-release
Diffstat (limited to 'indra/llcommon/indra_constants.cpp')
| -rw-r--r-- | indra/llcommon/indra_constants.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llcommon/indra_constants.cpp b/indra/llcommon/indra_constants.cpp index 60721977cd..7ea42a3fc0 100644 --- a/indra/llcommon/indra_constants.cpp +++ b/indra/llcommon/indra_constants.cpp @@ -60,6 +60,10 @@ const LLUUID IMG_SMOKE_POOF ("1e63e323-5fe0-452e-92f8-b98bd0f764e3"); // On d const LLUUID IMG_BIG_EXPLOSION_1 ("5e47a0dc-97bf-44e0-8b40-de06718cee9d"); // On dataserver const LLUUID IMG_BIG_EXPLOSION_2 ("9c8eca51-53d5-42a7-bb58-cef070395db8"); // On dataserver +const LLUUID IMG_ALPHA_GRAD ("e97cf410-8e61-7005-ec06-629eba4cd1fb"); // VIEWER +const LLUUID IMG_ALPHA_GRAD_2D ("38b86f85-2575-52a9-a531-23108d8da837"); // VIEWER +const LLUUID IMG_TRANSPARENT ("8dcd4a48-2d37-4909-9f78-f7a9eb4ef903"); // VIEWER + const LLUUID IMG_BLOOM1 ("3c59f7fe-9dc8-47f9-8aaf-a9dd1fbc3bef"); // VIEWER const LLUUID TERRAIN_DIRT_DETAIL ("0bc58228-74a0-7e83-89bc-5c23464bcec5"); // VIEWER const LLUUID TERRAIN_GRASS_DETAIL ("63338ede-0037-c4fd-855b-015d77112fc8"); // VIEWER |