diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2017-11-14 20:35:07 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2017-11-14 20:35:07 +0200 |
| commit | 627abf0957cdd1db6edd7f7adff8e17031f22802 (patch) | |
| tree | 4b93c3c57f7238e47407ac8c1728a88098c9e121 | |
| parent | e2e23eb5cba261944ec2d4faae3da010d4290f6f (diff) | |
| parent | 02e418a5cdb109ea626ad7677ff223e464cc220a (diff) | |
Merged in lindenlab/viewer-lynx
| -rw-r--r-- | indra/newview/lldrawpoolavatar.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llvotree.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp index e38c7ee080..8128790eb6 100644 --- a/indra/newview/lldrawpoolavatar.cpp +++ b/indra/newview/lldrawpoolavatar.cpp @@ -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()); } } diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 33ab188704..eae8f2cc56 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -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()); } } } diff --git a/indra/newview/llvotree.cpp b/indra/newview/llvotree.cpp index 5193d3bb0e..369ddebe2d 100644 --- a/indra/newview/llvotree.cpp +++ b/indra/newview/llvotree.cpp @@ -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(); |