aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llvoavatar.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llvoavatar.cpp')
-rw-r--r--linden/indra/newview/llvoavatar.cpp7
1 files changed, 0 insertions, 7 deletions
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 359ac74..aac4e41 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -2500,7 +2500,6 @@ void LLVOAvatar::computeBodySize()
2500 2500
2501 // some of the joints have not been cached 2501 // some of the joints have not been cached
2502 LLVector3 skull = mSkullp->getPosition(); 2502 LLVector3 skull = mSkullp->getPosition();
2503 LLVector3 skull_scale = mSkullp->getScale();
2504 2503
2505 LLVector3 neck = mNeckp->getPosition(); 2504 LLVector3 neck = mNeckp->getPosition();
2506 LLVector3 neck_scale = mNeckp->getScale(); 2505 LLVector3 neck_scale = mNeckp->getScale();
@@ -2580,7 +2579,6 @@ U32 LLVOAvatar::processUpdateMessage(LLMessageSystem *mesgsys,
2580{ 2579{
2581 LLMemType mt(LLMemType::MTYPE_AVATAR); 2580 LLMemType mt(LLMemType::MTYPE_AVATAR);
2582 2581
2583 LLVector3 old_vel = getVelocity();
2584 // Do base class updates... 2582 // Do base class updates...
2585 U32 retval = LLViewerObject::processUpdateMessage(mesgsys, user_data, block_num, update_type, dp); 2583 U32 retval = LLViewerObject::processUpdateMessage(mesgsys, user_data, block_num, update_type, dp);
2586 2584
@@ -3823,8 +3821,6 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
3823 mNameText->setLabel(mNameString); 3821 mNameText->setLabel(mNameString);
3824 } 3822 }
3825 3823
3826 char line[MAX_STRING]; /* Flawfinder: ignore */
3827 line[0] = '\0';
3828 std::deque<LLChat>::iterator chat_iter = mChats.begin(); 3824 std::deque<LLChat>::iterator chat_iter = mChats.begin();
3829 mNameText->clearString(); 3825 mNameText->clearString();
3830 3826
@@ -4287,8 +4283,6 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
4287 xyVel.mV[VZ] = 0.0f; 4283 xyVel.mV[VZ] = 0.0f;
4288 speed = xyVel.length(); 4284 speed = xyVel.length();
4289 4285
4290 BOOL throttle = TRUE;
4291
4292 if (!(mIsSitting && getParent())) 4286 if (!(mIsSitting && getParent()))
4293 { 4287 {
4294 //-------------------------------------------------------------------- 4288 //--------------------------------------------------------------------
@@ -4299,7 +4293,6 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
4299 if (mTimeLast == 0.0f) 4293 if (mTimeLast == 0.0f)
4300 { 4294 {
4301 mTimeLast = animation_time; 4295 mTimeLast = animation_time;
4302 throttle = FALSE;
4303 4296
4304 // put the pelvis at slaved position/mRotation 4297 // put the pelvis at slaved position/mRotation
4305 mRoot.setWorldPosition( getPositionAgent() ); // first frame 4298 mRoot.setWorldPosition( getPositionAgent() ); // first frame