From 328cf0d1c71efa785b0f1201c27776a3a6d6a041 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Mon, 26 Sep 2011 20:00:38 -0500 Subject: Merge cleanup --- indra/newview/lldrawpoolavatar.cpp | 3 +-- 1 file changed, 1 insertion(+), 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))) { -- cgit v1.2.3