summaryrefslogtreecommitdiff
path: root/indra/llcommon/indra_constants.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2016-04-21 14:47:09 -0400
committerOz Linden <oz@lindenlab.com>2016-04-21 14:47:09 -0400
commit185aeb2dcc6953b86e25dcb1c3727e7f1255acbc (patch)
tree8db1d05fe83754720a54054abf9d4dbebfaadaa9 /indra/llcommon/indra_constants.cpp
parent56ca48390535f543456a0b59365b428198414d4f (diff)
parent503dc6ee656bdf579107ff9712ae8e960dd91100 (diff)
Merged in ruslantproductengine/ruslanteliuk-391-blizzard (pull request #30)
MAINT-6317 [QuickGraphics-RC] Some rigged mesh attachments render fully on jellybaby avatars when ALM is enabled
Diffstat (limited to 'indra/llcommon/indra_constants.cpp')
-rw-r--r--indra/llcommon/indra_constants.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/llcommon/indra_constants.cpp b/indra/llcommon/indra_constants.cpp
index 1d094cd4f4..60721977cd 100644
--- a/indra/llcommon/indra_constants.cpp
+++ b/indra/llcommon/indra_constants.cpp
@@ -68,4 +68,3 @@ 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 ("3b39cc01-c2d1-e194-1181-e4404978b20c"); // On dataserver