diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-02-26 16:54:00 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-02-26 16:54:00 -0500 |
commit | 80b010b199f3a915cab7654ff3eed5b6d7a66e75 (patch) | |
tree | 3f32a5180dd6e79083a8a5c81d6c1195fc7425f6 /indra/newview | |
parent | 2a4ed560c4559b7cd6b881eb596ddc9c2e81777b (diff) |
SL-109 WIP - minor code cleanup
Diffstat (limited to 'indra/newview')
-rwxr-xr-x | indra/newview/llviewerjointmesh.cpp | 1 | ||||
-rwxr-xr-x | indra/newview/llvoavatar.cpp | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/indra/newview/llviewerjointmesh.cpp b/indra/newview/llviewerjointmesh.cpp index 2632296c70..43a81ada49 100755 --- a/indra/newview/llviewerjointmesh.cpp +++ b/indra/newview/llviewerjointmesh.cpp @@ -195,7 +195,6 @@ void LLViewerJointMesh::uploadJointMatrices() for (joint_num = 0; joint_num < reference_mesh->mJointRenderData.size(); ++joint_num) { gJointMatAligned[joint_num].loadu(gJointMatUnaligned[joint_num]); - //gJointMatAligned[joint_num].loadu(*reference_mesh->mJointRenderData[joint_num]->mWorldMatrix); } } } diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 84d585df02..a8cc797f16 100755 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -1384,14 +1384,11 @@ void render_sphere_and_line(const LLVector3& begin_pos, const LLVector3& end_pos void LLVOAvatar::renderCollisionVolumes() { std::ostringstream ostr; + for (S32 i = 0; i < mNumCollisionVolumes; i++) { - //mCollisionVolumes[i].renderCollision(); ostr << mCollisionVolumes[i].getName() << ", "; - } - for (S32 i = 0; i < mNumCollisionVolumes; i++) - { LLAvatarJointCollisionVolume& collision_volume = mCollisionVolumes[i]; collision_volume.updateWorldMatrix(); |