diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-09-27 19:34:41 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-09-27 19:34:41 +0100 |
| commit | 4d4255c27b45ed5e32fe7c4870e2ce3ed10cb140 (patch) | |
| tree | 50a69d38060aca293aed567e5149597e360128bb /indra/newview/lldrawable.cpp | |
| parent | 963945b3ab258ea445e1d9757fc5a89ce397ff7b (diff) | |
SL-1350 - keep control avatar rotation synced to corresponding root drawable
Diffstat (limited to 'indra/newview/lldrawable.cpp')
| -rw-r--r-- | indra/newview/lldrawable.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp index 55db721ccf..8c6cbc020b 100644 --- a/indra/newview/lldrawable.cpp +++ b/indra/newview/lldrawable.cpp @@ -52,7 +52,6 @@ #include "llviewerwindow.h" #include "llvocache.h" #include "llcontrolavatar.h" -#include "llcallstack.h" #include "lldrawpoolavatar.h" const F32 MIN_INTERPOLATE_DISTANCE_SQUARED = 0.001f * 0.001f; @@ -730,6 +729,10 @@ F32 LLDrawable::updateXform(BOOL undamped) mXform.setRotation(target_rot); mXform.setScale(LLVector3(1,1,1)); //no scale in drawable transforms (IT'S A RULE!) mXform.updateMatrix(); + if (isRoot() && mVObjp->isAnimatedObject() && mVObjp->getControlAvatar()) + { + mVObjp->getControlAvatar()->matchVolumeTransform(); + } if (mSpatialBridge) { |