diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-09-28 19:06:36 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-09-28 19:06:36 +0100 |
| commit | 108fe6234488d9a383dea0be327af403487135f3 (patch) | |
| tree | 7be757e94578624338b80352272c3bc669909229 /indra/newview/llviewerobject.cpp | |
| parent | 2851793e670bbdff79f97534206bd3d7b4ae003d (diff) | |
SL-761, SL-718 - transform matrix munging for skeletons of animated object attachments, to allow editing to work correctly
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 0140a63e73..99c68dab10 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -3981,7 +3981,7 @@ const LLVector3 LLViewerObject::getPivotPositionAgent() const const LLQuaternion LLViewerObject::getRenderRotation() const { LLQuaternion ret; - if (mDrawable.notNull() && mDrawable->isState(LLDrawable::RIGGED)) + if (mDrawable.notNull() && mDrawable->isState(LLDrawable::RIGGED) && !isAnimatedObject()) { return ret; } |