diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2018-03-01 19:38:21 -0500 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2018-03-01 19:38:21 -0500 |
commit | 12ccb65603ec50ac80d85c4e023ec8e026c9e1f2 (patch) | |
tree | f7bfc4b64718278041f46e1759f5de27c9d83864 /indra/newview/llvovolume.cpp | |
parent | 2e87bac8f9983faa6a1e46ee626d688a101fa070 (diff) | |
parent | 3c7086d4fff6c370f8ce2be51cab2502f663aab1 (diff) |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-451
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); |