diff options
author | Oz Linden <oz@lindenlab.com> | 2018-03-09 09:08:02 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2018-03-09 09:08:02 -0500 |
commit | aae241c43f66c3ef59cb076d00e42f9a857de354 (patch) | |
tree | 82da2afc116915897a3207cc8eed120aef5ef3fd /indra/newview/llvovolume.cpp | |
parent | 17bb7f4fc5463e9426179b0ded810b51ef291c79 (diff) | |
parent | f8c76535a35aaf245e261357a59e977bac5b2501 (diff) |
merge changes for 5.1.2-release
Diffstat (limited to 'indra/newview/llvovolume.cpp')
-rw-r--r-- | indra/newview/llvovolume.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index f77b48ff80..7b4d8ef329 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -628,7 +628,7 @@ void LLVOVolume::updateTextures() if (mDrawable.notNull() && !isVisible() && !mDrawable->isActive()) { //delete vertex buffer to free up some VRAM LLSpatialGroup* group = mDrawable->getSpatialGroup(); - if (group) + if (group && (group->mVertexBuffer.notNull() || !group->mBufferMap.empty() || !group->mDrawMap.empty())) { group->destroyGL(true); |