From 6d3814c16b00db8d4db130bcc5e5d475311c2eaf Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 19 Mar 2013 00:05:29 +0100 Subject: [PATCH] Backed out changeset: 1b4e80aeaba7: This might result in textures being reloaded after they become visible, but it helps in releasing memory from the viewer --- indra/newview/llviewertexture.cpp | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 90603eaf82..8c717810ae 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -1404,20 +1404,10 @@ void LLViewerFetchedTexture::dump() // ONLY called from LLViewerFetchedTextureList void LLViewerFetchedTexture::destroyTexture() { - // This was commented out as part of MAINT-775 and is a REALLY bad idea! - // It will dump textures off memory once you turn away and you - // will end up with gray textures that need to be fetched again. - // Let's do this smarter and drop textures off memory soon before - // we reach the desired max texture memory! //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 ;