diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-19 14:22:05 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-19 14:22:05 +0100 |
| commit | 532d732645f2369d17eba9c2ed0d594b486d416e (patch) | |
| tree | da6d4ab55e646420c54d277e9298434125122739 /indra/newview/llvoavatar.cpp | |
| parent | fbc2064962e72a3ab9232c8a1b939c6a290027bf (diff) | |
| parent | 2336188eeda9d074282886c610c918328e563fb7 (diff) | |
merge from viewer-hotfix
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index acb3b0d458..5100f4e59a 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -5644,6 +5644,8 @@ void LLVOAvatar::sitOnObject(LLViewerObject *sit_object) mDrawable->mXform.setRotation(mDrawable->getWorldRotation() * inv_obj_rot); gPipeline.markMoved(mDrawable, TRUE); + // Notice that removing sitDown() from here causes avatars sitting on + // objects to be not rendered for new arrivals. See EXT-6835 and EXT-1655. sitDown(TRUE); mRoot.getXform()->setParent(&sit_object->mDrawable->mXform); // LLVOAvatar::sitOnObject mRoot.setPosition(getPosition()); |