diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-03-22 16:30:59 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-03-22 16:30:59 -0400 |
| commit | ded162be6084e77dd4d4cb13a62d6e2303507dac (patch) | |
| tree | e8c678f212955ecd6f26ba5ffa13fc4db175dff0 /indra/llcommon | |
| parent | 31f3db02919870a8e92c9452de477c1478b273e9 (diff) | |
fix merge error for specular rendering on impostors
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/indra_constants.cpp | 2 | ||||
| -rw-r--r-- | indra/llcommon/indra_constants.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/indra_constants.cpp b/indra/llcommon/indra_constants.cpp index 90866631fe..1d094cd4f4 100644 --- a/indra/llcommon/indra_constants.cpp +++ b/indra/llcommon/indra_constants.cpp @@ -68,4 +68,4 @@ const LLUUID TERRAIN_ROCK_DETAIL ("53a2f406-4895-1d13-d541-d2e3b86bc19c"); // V const LLUUID DEFAULT_WATER_NORMAL ("822ded49-9a6c-f61c-cb89-6df54f42cdf4"); // VIEWER -const LLUUID IMG_BLACK_SQUARE_MALEVICH ("3b39cc01-c2d1-e194-1181-e4404978b20c"); // On dataserver +const LLUUID IMG_BLACK_SQUARE ("3b39cc01-c2d1-e194-1181-e4404978b20c"); // On dataserver diff --git a/indra/llcommon/indra_constants.h b/indra/llcommon/indra_constants.h index 6a9e777e69..6d39aef32e 100644 --- a/indra/llcommon/indra_constants.h +++ b/indra/llcommon/indra_constants.h @@ -205,7 +205,7 @@ LL_COMMON_API extern const LLUUID TERRAIN_ROCK_DETAIL; LL_COMMON_API extern const LLUUID DEFAULT_WATER_NORMAL; -LL_COMMON_API extern const LLUUID IMG_BLACK_SQUARE_MALEVICH; +LL_COMMON_API extern const LLUUID IMG_BLACK_SQUARE; // radius within which a chat message is fully audible |