diff options
| author | callum_linden <none@none> | 2017-08-22 14:32:04 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2017-08-22 14:32:04 -0700 |
| commit | b5dbb9c52aa8f9379662f1ff1169adadcf8ac5f8 (patch) | |
| tree | 438d099240df63608825568d162874e186835994 /indra/llrender | |
| parent | 8e6751efced8d9f5ede5ec5d954ff809d56d1162 (diff) | |
| parent | 58176de9574164e31790a148d9b5489a129fc961 (diff) | |
Automated merge with head of ll/viewer64 after DRTVWR-439 merge
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llvertexbuffer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp index 3851669360..420cd2d9c4 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) { |