summaryrefslogtreecommitdiff
path: root/indra/llappearance
diff options
context:
space:
mode:
authorAnchor Linden <anchor@lindenlab.com>2018-06-27 03:08:06 +0530
committerAnchor Linden <anchor@lindenlab.com>2018-06-27 03:08:06 +0530
commit8a13530ce4eeb481ee467fd3ec54f1ed7e9f632a (patch)
tree554aecb3cfe9639b92d2e5cde3511bf94056edc8 /indra/llappearance
parent69b2add00a9d371f6148d3102f1a54b3b6ce3175 (diff)
[MAINT-8742] - fix color/tint on universal tattoos
Diffstat (limited to 'indra/llappearance')
-rw-r--r--indra/llappearance/llavatarappearance.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/llappearance/llavatarappearance.cpp b/indra/llappearance/llavatarappearance.cpp
index 49655054b6..b1dd4a4cb1 100644
--- a/indra/llappearance/llavatarappearance.cpp
+++ b/indra/llappearance/llavatarappearance.cpp
@@ -1476,6 +1476,10 @@ BOOL LLAvatarAppearance::teToColorParams( ETextureIndex te, U32 *param_name )
case TEX_HEAD_TATTOO:
case TEX_LOWER_TATTOO:
case TEX_UPPER_TATTOO:
+ param_name[0] = 1071; //"tattoo_red";
+ param_name[1] = 1072; //"tattoo_green";
+ param_name[2] = 1073; //"tattoo_blue";
+ break;
case TEX_HEAD_UNIVERSAL_TATTOO:
case TEX_UPPER_UNIVERSAL_TATTOO:
case TEX_LOWER_UNIVERSAL_TATTOO:
@@ -1487,9 +1491,9 @@ BOOL LLAvatarAppearance::teToColorParams( ETextureIndex te, U32 *param_name )
case TEX_AUX1_TATTOO:
case TEX_AUX2_TATTOO:
case TEX_AUX3_TATTOO:
- param_name[0] = 1071; //"tattoo_red";
- param_name[1] = 1072; //"tattoo_green";
- param_name[2] = 1073; //"tattoo_blue";
+ param_name[0] = 1029; //"tattoo_universal_red";
+ param_name[1] = 1030; //"tattoo_universal_green";
+ param_name[2] = 1031; //"tattoo_universal_blue";
break;
default: