From 366c54e9bbf3b9cafdb45ce9726483d341adb02b Mon Sep 17 00:00:00 2001
From: Neal Orman <nyx@lindenlab.com>
Date: Tue, 20 Oct 2009 20:01:27 +0000
Subject: [PATCH] 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
---
indra/newview/llvoavatarself.cpp | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index 03f9bd4b7c9..cf7a0b65f67 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();
}
--
GitLab