diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2012-08-03 14:49:49 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2012-08-03 14:49:49 -0400 |
| commit | 0664cb1512481b9cd9f5ef4bc398c88416b246a9 (patch) | |
| tree | 552a1d8207942c08ae379dfa916b2e5afcd3912e /indra/newview/llviewertexture.cpp | |
| parent | bf004be1023347bcabaae6baa1624b2ed78d69fd (diff) | |
| parent | 7d98d1afb036ce4b221e101e6de153a3d978ba9f (diff) | |
Automated merge with ssh://hg.lindenlab.com/monty/viewer-drano-http
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 d844aeb12a..7f638a24bf 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -1398,10 +1398,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)//not ready to release unused memory. + //{ + // return ; + //} if (mNeedsCreateTexture)//return if in the process of generating a new texture. { return ; |