diff options
author | Neal Orman <nyx@lindenlab.com> | 2009-10-20 20:01:27 +0000 |
---|---|---|
committer | Neal Orman <nyx@lindenlab.com> | 2009-10-20 20:01:27 +0000 |
commit | 366c54e9bbf3b9cafdb45ce9726483d341adb02b (patch) | |
tree | 13b0a8903f276963ea997a127286b8a6d7f6c94a /indra/newview/llvoavatarself.cpp | |
parent | a374d7b58c6c71d54434dd43168495ca8537045d (diff) |
EXT-1664 male avatars have female bodies
Previous patch improved the situation but reversed it - it was still possible to have a mismatch between an avatar's head and body for their gender.
This patch makes the copying of the gender from your shape wearable to your avatar more explicit, which appears to fix the issue for now.
This should get the behavior correct for testing purposes, and we will look into fixing more underlying issues for the next cycle.
Code reviewed by Seraph
Diffstat (limited to 'indra/newview/llvoavatarself.cpp')
-rw-r--r-- | indra/newview/llvoavatarself.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index 03f9bd4b7c..cf7a0b65f6 100644 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -693,6 +693,13 @@ void LLVOAvatarSelf::updateVisualParams() } } + LLWearable *shape = gAgentWearables.getWearable(WT_SHAPE,0); + if (shape) + { + F32 gender = shape->getVisualParamWeight(80); // param 80 == gender + setVisualParamWeight("male",gender ,TRUE); + } + LLVOAvatar::updateVisualParams(); } |