diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-01-29 18:25:03 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-01-29 18:25:03 -0500 |
| commit | 7b1e1e4e35351936f2ab0305a91691f78f69519d (patch) | |
| tree | 33fe5158da98924ed8fb96cffd73e24bce1b37db /indra/newview/lldrawpoolavatar.cpp | |
| parent | cabd5867b7bb35cff08024a5b7305f1ad8adf3fb (diff) | |
FITMESH-6: correct bounds checking
Diffstat (limited to 'indra/newview/lldrawpoolavatar.cpp')
| -rwxr-xr-x | indra/newview/lldrawpoolavatar.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp index 4578d3d0cd..906b7b2809 100755 --- a/indra/newview/lldrawpoolavatar.cpp +++ b/indra/newview/lldrawpoolavatar.cpp @@ -698,7 +698,7 @@ void LLDrawPoolAvatar::beginDeferredImpostor() specular_channel = sVertexProgram->enableTexture(LLViewerShaderMgr::SPECULAR_MAP); normal_channel = sVertexProgram->enableTexture(LLViewerShaderMgr::DEFERRED_NORMAL); sDiffuseChannel = sVertexProgram->enableTexture(LLViewerShaderMgr::DIFFUSE_MAP); - sVertexProgram->bind(); + U1573sVertexProgram->bind(); sVertexProgram->setMinimumAlpha(0.01f); } @@ -1586,7 +1586,8 @@ void LLDrawPoolAvatar::updateRiggedFaceVertexBuffer(LLVOAvatar* avatar, LLFace* LLMatrix4a mp[JOINT_COUNT]; LLMatrix4* mat = (LLMatrix4*) mp; - for (U32 j = 0; j < skin->mJointNames.size(); ++j) + U32 count = llmin((U32) skin->mJointNames.size(), (U32) JOINT_COUNT); + for (U32 j = 0; j < count; ++j) { LLJoint* joint = avatar->getJoint(skin->mJointNames[j]); if (joint) |