summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2017-08-09 01:22:57 +0300
committerAndreyL ProductEngine <alihatskiy@productengine.com>2017-08-09 01:22:57 +0300
commitc4cd263958e86b5878726f231924bb13353b83e8 (patch)
treea06fff640edc6208ce0a151c0bcba6c93852462c
parent902cfb7a2266929eccf5ec1cef960b14771e1eea (diff)
parentcf865bb5962a85e2da3414468d6a99ecb5423f97 (diff)
Merged in lindenlab/viewer-lynx
-rw-r--r--indra/llrender/llvertexbuffer.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp
index 31dffdd545..607bbf3b3b 100644
--- a/indra/llrender/llvertexbuffer.cpp
+++ b/indra/llrender/llvertexbuffer.cpp
@@ -1234,7 +1234,7 @@ void LLVertexBuffer::createGLIndices(U32 size)
void LLVertexBuffer::destroyGLBuffer()
{
- if (mGLBuffer)
+ if (mGLBuffer || mMappedData)
{
if (mMappedDataUsingVBOs)
{
@@ -1254,7 +1254,7 @@ void LLVertexBuffer::destroyGLBuffer()
void LLVertexBuffer::destroyGLIndices()
{
- if (mGLIndices)
+ if (mGLIndices || mMappedIndexData)
{
if (mMappedIndexDataUsingVBOs)
{