diff options
| author | Kent Quirk <q@lindenlab.com> | 2010-04-14 15:22:51 -0400 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2010-04-14 15:22:51 -0400 |
| commit | b15629c12f9371773998075f8b599527b73c3051 (patch) | |
| tree | 2f310864b495ef3817208a9f0984d2d9a544bc4b /indra/newview/llvoavatar.cpp | |
| parent | 244418e6b2f4647d09995492f52180a0d3824cd2 (diff) | |
This change originally to fix EXT-1655 has caused a failure to render sitting avatars (EXT-6835).
We can probably find a "right" fix, but for now backing it out.
Backed out changeset bd384ded4268
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(); |