diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-17 12:02:54 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-17 12:02:54 +0100 |
| commit | 06884cf1371d4c1ee02d337242e46b0f3bbe8837 (patch) | |
| tree | 9255ad9db22916ae0add7cae37705e58aa9c465e /indra/newview/llvoavatar.cpp | |
| parent | 663d8f7870c2858956aea8ab20129fd084a96dc8 (diff) | |
| parent | d69084d5d86d551adbc9721276aa60959b7d7899 (diff) | |
merge from PE's viewer-trunk
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 8c5928224f..acb3b0d458 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -5612,8 +5612,6 @@ void LLVOAvatar::sitDown(BOOL bSitting) //----------------------------------------------------------------------------- void LLVOAvatar::sitOnObject(LLViewerObject *sit_object) { - sitDown(TRUE); - if (isSelf()) { // Might be first sit @@ -5646,6 +5644,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(); |