diff options
author | Oz Linden <oz@lindenlab.com> | 2011-05-23 11:38:33 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-05-23 11:38:33 -0400 |
commit | 551d17f819ea3dbcdc61cb41a458ab6d893d28cf (patch) | |
tree | 130c90ed3b0f6a4245af843cf9170130d549dc4f /indra/newview/llviewerjointmesh_vec.cpp | |
parent | 99fe1004a6cb4406bcac790420a5be6269e02723 (diff) | |
parent | e5752934be74a84e6ec0ff8cb96974bd1e9060ec (diff) |
merge latest changes (post-2.7.0) from viewer-development
Diffstat (limited to 'indra/newview/llviewerjointmesh_vec.cpp')
-rw-r--r-- | indra/newview/llviewerjointmesh_vec.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewerjointmesh_vec.cpp b/indra/newview/llviewerjointmesh_vec.cpp index c9371030ad..6600d01d17 100644 --- a/indra/newview/llviewerjointmesh_vec.cpp +++ b/indra/newview/llviewerjointmesh_vec.cpp @@ -46,6 +46,7 @@ // static void LLViewerJointMesh::updateGeometryVectorized(LLFace *face, LLPolyMesh *mesh) { +#if 0 static LLV4Matrix4 sJointMat[32]; LLDynamicArray<LLJointRenderData*>& joint_data = mesh->getReferenceMesh()->mJointRenderData; S32 j, joint_num, joint_end = joint_data.count(); @@ -92,4 +93,5 @@ void LLViewerJointMesh::updateGeometryVectorized(LLFace *face, LLPolyMesh *mesh) } buffer->setBuffer(0); +#endif } |