diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-02-14 12:16:37 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-02-14 12:16:37 -0600 |
| commit | cc260a635674c56d8fab88a5cd4dd188b4c9ac9c (patch) | |
| tree | b9188e73b1aed56fbda8f8cdd73d64488d8e7c68 /indra/newview/llviewertexture.cpp | |
| parent | 3fa68c78f8f3a190fffeadd7a181cff16fbc96b0 (diff) | |
| parent | bc60d34f68948542d863229617c22ba0ae6a186a (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
| -rw-r--r-- | indra/newview/llviewertexture.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 634ff1392e..9a8beb6234 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -1446,10 +1446,10 @@ void LLViewerFetchedTexture::dump() // ONLY called from LLViewerFetchedTextureList void LLViewerFetchedTexture::destroyTexture() { - //if(LLImageGL::sGlobalTextureMemoryInBytes < sMaxDesiredTextureMemInBytes)//not ready to release unused memory. - //{ - // return ; - //} + if(LLImageGL::sGlobalTextureMemoryInBytes < sMaxDesiredTextureMemInBytes * 0.95f)//not ready to release unused memory. + { + return ; + } if (mNeedsCreateTexture)//return if in the process of generating a new texture. { return ; |