summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2017-08-09 00:04:25 +0300
committerAndreyL ProductEngine <alihatskiy@productengine.com>2017-08-09 00:04:25 +0300
commitcf865bb5962a85e2da3414468d6a99ecb5423f97 (patch)
treed94120ca4608e6f0da22c1b1d3c355ed28e45246 /indra
parent5250a86e7b35ca0710b1ae8235500786c0559a7c (diff)
MAINT-7652 Fix for crash in LLVertexBuffer::~LLVertexBuffer() destructor
Diffstat (limited to 'indra')
-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)
{