diff options
author | Dave Parks <davep@lindenlab.com> | 2012-06-28 16:32:54 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2012-06-28 16:32:54 -0500 |
commit | bedbbf7c0201275e0a48a0cbbb2a567be4baab3d (patch) | |
tree | f11f9e612ab503e596073269c17c6e4cc1d3ae13 /indra/newview/llviewertexture.cpp | |
parent | 90547ff411db177bf6424ca553449a81a808fc0f (diff) | |
parent | f3afac420cd3c89eb396fb1f0b77ab4804212415 (diff) |
Merge
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 ; |