summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Nikolenko <maximnproductengine@lindenlab.com>2024-12-18 02:09:21 +0200
committerMnikolenko Productengine <mnikolenko@productengine.com>2025-03-05 15:42:27 +0200
commit1a4af234025d1145f6d197cf4f3374d9309af2eb (patch)
tree306f52ccb3f8eabb160465973dad056ea0f93478
parentef915c4c58ed8d6623e54042bb58b8ad7934411e (diff)
#3256 force undampened movement for attached animated linkset in mouselook
-rw-r--r--indra/newview/lldrawable.cpp9
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();
}