diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-02-14 12:15:59 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-02-14 12:15:59 -0600 |
| commit | bc60d34f68948542d863229617c22ba0ae6a186a (patch) | |
| tree | 5b74eff7950be0642343954ee7913c06a0d25187 /indra/newview/llviewertexture.cpp | |
| parent | f7c57fe1715368f23b716c5591afe6cb7feb34bf (diff) | |
MAINT-2368 Pull in Firestorm fix for textures unloading behind you.
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 ; |