diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-07 13:03:35 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-07 13:03:35 +0100 |
| commit | adce2ecdf8f3a0efcd4907699d286012124ac496 (patch) | |
| tree | f36622a23028b73946bd3b70fd741b4f30464e33 /indra/newview/llvoavatar.cpp | |
| parent | 8da371b0f08f92fb1fef083f0bfb526f0698afd7 (diff) | |
| parent | 7dd71a60c51ed81c1ddfa98d09a158488a85b753 (diff) | |
PE merge from pe-viewer-trunk
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 0ce8894872..af833db9c3 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -5607,6 +5607,8 @@ void LLVOAvatar::sitDown(BOOL bSitting) //----------------------------------------------------------------------------- void LLVOAvatar::sitOnObject(LLViewerObject *sit_object) { + sitDown(TRUE); + if (isSelf()) { // Might be first sit @@ -5639,7 +5641,6 @@ 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(); |