diff options
Diffstat (limited to 'linden/indra/newview/llvoavatar.cpp')
-rw-r--r-- | linden/indra/newview/llvoavatar.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp index 11f4857..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 | ||
@@ -3287,6 +3285,11 @@ void LLVOAvatar::resolveClient(LLColor4& avatar_name_color, std::string& client, | |||
3287 | avatar_name_color += colour; | 3285 | avatar_name_color += colour; |
3288 | avatar_name_color *= 1.0/(cllsd["multiple"].asReal()+1.0f); | 3286 | avatar_name_color *= 1.0/(cllsd["multiple"].asReal()+1.0f); |
3289 | } | 3287 | } |
3288 | else if(idx == LLUUID("7eab0700-f000-0000-0000-546561706f74")) | ||
3289 | { | ||
3290 | avatar_name_color = LLColor4(0.69f,0.42f,0.84f,1.0f); // Armins V3 viewer. | ||
3291 | client = "Teapot"; | ||
3292 | } | ||
3290 | else if(idx == LLUUID("2a9a406c-f448-68f2-4e38-878f8c46c190") || | 3293 | else if(idx == LLUUID("2a9a406c-f448-68f2-4e38-878f8c46c190") || |
3291 | idx == LLUUID("b6820989-bf42-ff59-ddde-fd3fd3a74fe4")) | 3294 | idx == LLUUID("b6820989-bf42-ff59-ddde-fd3fd3a74fe4")) |
3292 | { | 3295 | { |
@@ -3818,8 +3821,6 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last) | |||
3818 | mNameText->setLabel(mNameString); | 3821 | mNameText->setLabel(mNameString); |
3819 | } | 3822 | } |
3820 | 3823 | ||
3821 | char line[MAX_STRING]; /* Flawfinder: ignore */ | ||
3822 | line[0] = '\0'; | ||
3823 | std::deque<LLChat>::iterator chat_iter = mChats.begin(); | 3824 | std::deque<LLChat>::iterator chat_iter = mChats.begin(); |
3824 | mNameText->clearString(); | 3825 | mNameText->clearString(); |
3825 | 3826 | ||
@@ -4282,8 +4283,6 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent) | |||
4282 | xyVel.mV[VZ] = 0.0f; | 4283 | xyVel.mV[VZ] = 0.0f; |
4283 | speed = xyVel.length(); | 4284 | speed = xyVel.length(); |
4284 | 4285 | ||
4285 | BOOL throttle = TRUE; | ||
4286 | |||
4287 | if (!(mIsSitting && getParent())) | 4286 | if (!(mIsSitting && getParent())) |
4288 | { | 4287 | { |
4289 | //-------------------------------------------------------------------- | 4288 | //-------------------------------------------------------------------- |
@@ -4294,7 +4293,6 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent) | |||
4294 | if (mTimeLast == 0.0f) | 4293 | if (mTimeLast == 0.0f) |
4295 | { | 4294 | { |
4296 | mTimeLast = animation_time; | 4295 | mTimeLast = animation_time; |
4297 | throttle = FALSE; | ||
4298 | 4296 | ||
4299 | // put the pelvis at slaved position/mRotation | 4297 | // put the pelvis at slaved position/mRotation |
4300 | mRoot.setWorldPosition( getPositionAgent() ); // first frame | 4298 | mRoot.setWorldPosition( getPositionAgent() ); // first frame |