diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-04-19 13:53:57 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-04-19 13:53:57 -0400 |
| commit | 7f0a7789903809d489e9f85575be18c88df1ea98 (patch) | |
| tree | 1aa3428c097ef8e19f1e518eb2e3e6996d16a2bc /indra/newview/llvoavatar.cpp | |
| parent | aa5e494e0cf1242dcd35725576667ab1a935363a (diff) | |
| parent | 1c352ebb5bfda6d53c844dca130302b79b918796 (diff) | |
merge
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()); |