diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-03-01 10:38:22 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-03-01 10:38:22 -0500 |
| commit | e069e45012a06735f9d7f9bfae755ee995be4423 (patch) | |
| tree | 3b9fddc14f6c4a48e4ed12d465576ae8098923c3 /indra/llappearance/llavatarappearance.cpp | |
| parent | 70e22de2bb9bf8515d7e3cd68c7328beb75409d6 (diff) | |
| parent | fa29880ecd1ca9fb34507e1b712b111a7a3bb63e (diff) | |
merge
Diffstat (limited to 'indra/llappearance/llavatarappearance.cpp')
| -rwxr-xr-x | indra/llappearance/llavatarappearance.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/llappearance/llavatarappearance.cpp b/indra/llappearance/llavatarappearance.cpp index 89e64822f8..2d5744bb5e 100755 --- a/indra/llappearance/llavatarappearance.cpp +++ b/indra/llappearance/llavatarappearance.cpp @@ -462,6 +462,10 @@ void LLAvatarAppearance::computeBodySize() LLVector3 foot = mFootLeftp->getPosition(); + F32 old_offset = mAvatarOffset.mV[VZ]; + + mAvatarOffset.mV[VZ] = getVisualParamWeight(11001); + mPelvisToFoot = hip.mV[VZ] * pelvis_scale.mV[VZ] - knee.mV[VZ] * hip_scale.mV[VZ] - ankle.mV[VZ] * knee_scale.mV[VZ] - @@ -481,7 +485,10 @@ void LLAvatarAppearance::computeBodySize() new_body_size.mV[VX] = DEFAULT_AGENT_DEPTH; new_body_size.mV[VY] = DEFAULT_AGENT_WIDTH; - if (new_body_size != mBodySize) + mAvatarOffset.mV[VX] = 0.0f; + mAvatarOffset.mV[VY] = 0.0f; + + if (new_body_size != mBodySize || old_offset != mAvatarOffset.mV[VZ]) { mBodySize = new_body_size; bodySizeChanged(); |