diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2019-08-27 16:52:22 +0000 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2019-08-27 16:52:22 +0000 |
| commit | 3fe7577f5ba15477ef65637ca159e5ff92dcbade (patch) | |
| tree | 6bdf032f23906235b6c7d85554e193d5b7c56165 /indra/llappearance/llavatarappearance.cpp | |
| parent | f79fc96d08e37f119653f7db5a299a05454ff79c (diff) | |
| parent | 2cd01c8e92e2ecf4402a3a075ec8bdc6a8f20470 (diff) | |
Merged in graham_linden/viewer-eep-g (pull request #486)
Default
Diffstat (limited to 'indra/llappearance/llavatarappearance.cpp')
| -rw-r--r-- | indra/llappearance/llavatarappearance.cpp | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/indra/llappearance/llavatarappearance.cpp b/indra/llappearance/llavatarappearance.cpp index 0c0ad0d265..f7fbb6fda1 100644 --- a/indra/llappearance/llavatarappearance.cpp +++ b/indra/llappearance/llavatarappearance.cpp @@ -1482,6 +1482,21 @@ BOOL LLAvatarAppearance::teToColorParams( ETextureIndex te, U32 *param_name ) 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: + case TEX_SKIRT_TATTOO: + case TEX_HAIR_TATTOO: + case TEX_EYES_TATTOO: + case TEX_LEFT_ARM_TATTOO: + case TEX_LEFT_LEG_TATTOO: + case TEX_AUX1_TATTOO: + case TEX_AUX2_TATTOO: + case TEX_AUX3_TATTOO: + param_name[0] = 1238; //"tattoo_universal_red"; + param_name[1] = 1239; //"tattoo_universal_green"; + param_name[2] = 1240; //"tattoo_universal_blue"; break; default: @@ -1728,10 +1743,9 @@ void LLAvatarAppearance::makeJointAliases(LLAvatarBoneInfo *bone_info) mJointAliasMap[*i] = bone_name; } - LLAvatarBoneInfo::bones_t::const_iterator iter; - for (iter = bone_info->mChildren.begin(); iter != bone_info->mChildren.end(); ++iter) + for (LLAvatarBoneInfo* bone : bone_info->mChildren) { - makeJointAliases( *iter ); + makeJointAliases(bone); } } |