diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-03-06 12:29:59 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-06 12:29:59 -0500 |
| commit | 2f031e03d659eb0f1110d5ccec936767428eb3f5 (patch) | |
| tree | 4e61fdce618ca87066d8ff606c396ddc3902e80d /indra/newview/lldrawable.cpp | |
| parent | 616547993a6ad3135987d75eca9f753438984985 (diff) | |
| parent | 2dfa996db79fe1ceeea7fa33d96642e24b06aa65 (diff) | |
Merge pull request #3657 from secondlife/maxim/2025.03-develop-fixes
Cherry-picking develop fixes into 2025.03
Diffstat (limited to 'indra/newview/lldrawable.cpp')
| -rw-r--r-- | indra/newview/lldrawable.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp index 70ae4ee13f..4921964b35 100644 --- a/indra/newview/lldrawable.cpp +++ b/indra/newview/lldrawable.cpp @@ -33,6 +33,7 @@ // viewer includes #include "llagent.h" +#include "llagentcamera.h" #include "llcriticaldamp.h" #include "llface.h" #include "lllightconstants.h" @@ -778,6 +779,14 @@ bool LLDrawable::updateMove() makeActive(); + // #3256 force undampened movement for attached objects in mouselook + // to prevent animation bork for linkset with animated parts + if (!isRoot() && gAgentCamera.cameraMouselook() && + !mVObjp->isRiggedMesh() && mVObjp->getAvatar() && mVObjp->getAvatar()->isSelf()) + { + return updateMoveUndamped(); + } + return isState(MOVE_UNDAMPED) ? updateMoveUndamped() : updateMoveDamped(); } |