diff options
| author | graham linden <graham@lindenlab.com> | 2013-02-14 10:58:53 -0800 |
|---|---|---|
| committer | graham linden <graham@lindenlab.com> | 2013-02-14 10:58:53 -0800 |
| commit | 69133ca4e318fc93fed39589c9221251440bcb96 (patch) | |
| tree | 2dc4e923ba0a60b237f82df0aa9780e8cf378d0a /indra/newview/llviewertexture.cpp | |
| parent | e2f3ea50d57ac530512e0ed77c537f0722198c18 (diff) | |
| parent | cc260a635674c56d8fab88a5cd4dd188b4c9ac9c (diff) | |
Merged lindenlab/viewer-cat into default
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 ; |