diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-12-11 21:18:05 +0000 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-12-11 21:18:05 +0000 |
| commit | 6199cecd8bd40e9929f1863fcfa8220ccf9fdf3b (patch) | |
| tree | f0d3fd92ca654b3f2e40c804e85c023adf2939cb /indra/newview/llvoavatar.cpp | |
| parent | ef264fd82e48a376db3c31323b3fcffe4d9c32b4 (diff) | |
SL-704 - more comment review/cleanup, some avatar state handling updated for animated objects.
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index a5a9fbe0e6..53db1ffe32 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -3975,7 +3975,6 @@ void LLVOAvatar::updateRootPositionAndRotation(LLAgent& agent, F32 speed, bool w root_pos = gAgent.getPosGlobalFromAgent(getRenderPosition()); root_pos.mdV[VZ] += getVisualParamWeight(AVATAR_HOVER); - // AXON need to review mInAir calcs for animated objects, if the value even matters. LLVector3 normal; resolveHeightGlobal(root_pos, ground_under_pelvis, normal); F32 foot_to_ground = (F32) (root_pos.mdV[VZ] - mPelvisToFoot - ground_under_pelvis.mdV[VZ]); @@ -4024,9 +4023,8 @@ void LLVOAvatar::updateRootPositionAndRotation(LLAgent& agent, F32 speed, bool w //-------------------------------------------------------------------- if (!isControlAvatar() && !isAnyAnimationSignaled(AGENT_NO_ROTATE_ANIMS, NUM_AGENT_NO_ROTATE_ANIMS)) { - // AXON - should we always skip for control avatars? - // Rotation fixups for avatars in motion, some may be - // relevant. + // Rotation fixups for avatars in motion. + // Skip for animated objects. updateOrientation(agent, speed, delta_time); } } @@ -6130,8 +6128,7 @@ void LLVOAvatar::getGround(const LLVector3 &in_pos_agent, LLVector3 &out_pos_age LLVector3d z_vec(0.0f, 0.0f, 1.0f); LLVector3d p0_global, p1_global; - // AXON UPDATE FOR CONTROL AVS? - if (mIsDummy) + if (isUIAvatar()) { outNorm.setVec(z_vec); out_pos_agent = in_pos_agent; |