diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-08-16 15:43:58 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-08-16 15:43:58 -0400 |
| commit | 01e0b78c595e346bef4e771f9580006dd895367c (patch) | |
| tree | 90160c9edb07baa4fcfd022082608f96b1bfdc06 /indra/llrender | |
| parent | 2368c44a8e2b031e5a8ac199923a016915cfe96a (diff) | |
| parent | cf865bb5962a85e2da3414468d6a99ecb5423f97 (diff) | |
merge changes for DRTVWR-439
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) { |