diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2020-05-20 21:01:39 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2020-05-20 21:01:39 +0100 |
| commit | 6e8845a5b64635576fbacb69393520ab779e99ef (patch) | |
| tree | bbc554779841adc8dae143a434df5d55176ff7b5 /indra/newview | |
| parent | 37f5e2aab38172df02dfa8875e7e8560f956cd46 (diff) | |
SL-13000 - vertical pos fix for jellied avs
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 9dd2025b1b..1a2d8a3f43 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -3651,6 +3651,8 @@ void LLVOAvatar::updateAppearanceMessageDebugText() LLVector3 pelvis_pos = mPelvisp->getPosition(); debug_line += llformat(" rp %.3f pp %.3f", root_pos[2], pelvis_pos[2]); + const LLVector3& scale = getScale(); + debug_line += llformat(" scale-z %.3f", scale[2]); S32 is_visible = (S32) isVisible(); S32 is_m_visible = (S32) mVisible; debug_line += llformat(" v %d/%d", is_visible, is_m_visible); @@ -4258,6 +4260,10 @@ void LLVOAvatar::updateRootPositionAndRotation(LLAgent& agent, F32 speed, bool w if (!isSitting() && !was_sit_ground_constrained) { root_pos += LLVector3d(getHoverOffset()); + if (getOverallAppearance() == AOA_JELLYDOLL) + { + root_pos[2] -= 0.5 * (getScale()[VZ] - mBodySize.mV[VZ]); + } } LLControlAvatar *cav = dynamic_cast<LLControlAvatar*>(this); |