aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llvoavatar.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llvoavatar.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index d6c9e2f..a9ecf9d 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -6269,10 +6269,6 @@ void LLVOAvatar::sitOnObject(LLViewerObject *sit_object)
6269 mDrawable->mXform.setPosition(rel_pos); 6269 mDrawable->mXform.setPosition(rel_pos);
6270 mDrawable->mXform.setRotation(mDrawable->getWorldRotation() * inv_obj_rot); 6270 mDrawable->mXform.setRotation(mDrawable->getWorldRotation() * inv_obj_rot);
6271 6271
6272 //in case the viewerobject is not updated in time
6273 mDrawable->getVObj()->setPosition(sit_object->getWorldPosition()) ;
6274 mDrawable->getVObj()->setRotation(sit_object->getWorldRotation()) ;
6275
6276 gPipeline.markMoved(mDrawable, TRUE); 6272 gPipeline.markMoved(mDrawable, TRUE);
6277 mIsSitting = TRUE; 6273 mIsSitting = TRUE;
6278 mRoot.getXform()->setParent(&sit_object->mDrawable->mXform); // LLVOAvatar::sitOnObject 6274 mRoot.getXform()->setParent(&sit_object->mDrawable->mXform); // LLVOAvatar::sitOnObject
@@ -6333,10 +6329,6 @@ void LLVOAvatar::getOffObject()
6333 mDrawable->mXform.setPosition(cur_position_world); 6329 mDrawable->mXform.setPosition(cur_position_world);
6334 mDrawable->mXform.setRotation(cur_rotation_world); 6330 mDrawable->mXform.setRotation(cur_rotation_world);
6335 6331
6336 //in case the viewerobject is not updated from sim in time
6337 mDrawable->getVObj()->setPosition(cur_position_world);
6338 mDrawable->getVObj()->setRotation(cur_rotation_world);
6339
6340 gPipeline.markMoved(mDrawable, TRUE); 6332 gPipeline.markMoved(mDrawable, TRUE);
6341 6333
6342 mIsSitting = FALSE; 6334 mIsSitting = FALSE;