Merged in lindenlab/viewer-lynx

meow-7.2.2
AndreyL ProductEngine 2017-11-14 20:35:07 +02:00
commit 627abf0957
3 changed files with 5 additions and 5 deletions

View File

@ -1494,7 +1494,7 @@ void LLDrawPoolAvatar::getRiggedGeometry(
// allocate dummy triangle
buffer->allocateBuffer(1, 3, true);
memset((U8*)buffer->getMappedData(), 0, buffer->getSize());
memset((U8*)buffer->getIndicesPointer(), 0, buffer->getIndicesSize());
memset((U8*)buffer->getMappedIndices(), 0, buffer->getIndicesSize());
}
}
else
@ -1508,7 +1508,7 @@ void LLDrawPoolAvatar::getRiggedGeometry(
// allocate dummy triangle
buffer->resizeBuffer(1, 3);
memset((U8*)buffer->getMappedData(), 0, buffer->getSize());
memset((U8*)buffer->getIndicesPointer(), 0, buffer->getIndicesSize());
memset((U8*)buffer->getMappedIndices(), 0, buffer->getIndicesSize());
}
}

View File

@ -2094,7 +2094,7 @@ void LLVOAvatar::updateMeshData()
facep->setSize(1, 3);
buff->allocateBuffer(1, 3, true);
memset((U8*) buff->getMappedData(), 0, buff->getSize());
memset((U8*) buff->getIndicesPointer(), 0, buff->getIndicesSize());
memset((U8*) buff->getMappedIndices(), 0, buff->getIndicesSize());
}
facep->setVertexBuffer(buff);
}
@ -2114,7 +2114,7 @@ void LLVOAvatar::updateMeshData()
facep->setSize(1, 3);
buff->resizeBuffer(1, 3);
memset((U8*) buff->getMappedData(), 0, buff->getSize());
memset((U8*) buff->getIndicesPointer(), 0, buff->getIndicesSize());
memset((U8*) buff->getMappedIndices(), 0, buff->getIndicesSize());
}
}
}

View File

@ -897,7 +897,7 @@ void LLVOTree::updateMesh()
<< index_count << " indices" << LL_ENDL;
buff->allocateBuffer(1, 3, true);
memset((U8*)buff->getMappedData(), 0, buff->getSize());
memset((U8*)buff->getIndicesPointer(), 0, buff->getIndicesSize());
memset((U8*)buff->getMappedIndices(), 0, buff->getIndicesSize());
facep->setSize(1, 3);
facep->setVertexBuffer(buff);
mReferenceBuffer->flush();