diff options
| author | Kent Quirk <q@lindenlab.com> | 2010-04-14 15:23:32 -0400 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2010-04-14 15:23:32 -0400 |
| commit | 17fb406546c933a0ce7184e6dbe0b5b83f72ed28 (patch) | |
| tree | 995b68e72fb3c3d072a93f692ae1c5173c08daaa /indra/newview/llvoavatar.cpp | |
| parent | 451d58947fa51b352d333f68a7b2427129a2ffa2 (diff) | |
| parent | b15629c12f9371773998075f8b599527b73c3051 (diff) | |
Merge backout of EXT-1655
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 16eb877b1d..f5e83ed025 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -5619,8 +5619,6 @@ void LLVOAvatar::sitDown(BOOL bSitting) //----------------------------------------------------------------------------- void LLVOAvatar::sitOnObject(LLViewerObject *sit_object) { - sitDown(TRUE); - if (isSelf()) { // Might be first sit @@ -5653,6 +5651,7 @@ void LLVOAvatar::sitOnObject(LLViewerObject *sit_object) mDrawable->mXform.setRotation(mDrawable->getWorldRotation() * inv_obj_rot); gPipeline.markMoved(mDrawable, TRUE); + sitDown(TRUE); mRoot.getXform()->setParent(&sit_object->mDrawable->mXform); // LLVOAvatar::sitOnObject mRoot.setPosition(getPosition()); mRoot.updateWorldMatrixChildren(); |