diff options
author | Dave Parks <davep@lindenlab.com> | 2011-09-26 20:00:38 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-09-26 20:00:38 -0500 |
commit | 328cf0d1c71efa785b0f1201c27776a3a6d6a041 (patch) | |
tree | 82db94150f7ed7509bf171542c07ba7d5f5473e1 /indra/newview | |
parent | bd02cdc75f1c752a127d1303527be3a96479af93 (diff) |
Merge cleanup
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/lldrawpoolavatar.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp index 6acc195889..d9b0b195f5 100644 --- a/indra/newview/lldrawpoolavatar.cpp +++ b/indra/newview/lldrawpoolavatar.cpp @@ -1277,9 +1277,8 @@ void LLDrawPoolAvatar::updateRiggedFaceVertexBuffer(LLVOAvatar* avatar, LLFace* S32 num_verts = (vol_face.mNumVertices + 0xF) & ~0xF; if (buffer.isNull() || - buffer->getTypeMask() != data_mask || - buffer->getRequestedVerts() != num_verts) + buffer->getRequestedVerts() != num_verts || buffer->getRequestedIndices() != vol_face.mNumIndices || (drawable && drawable->isState(LLDrawable::REBUILD_ALL))) { |