livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge backout

Ansariel 2013-03-19 00:06:00 +01:00
parent c28dbac538 6d3814c16b
commit 691028cd08
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llviewertexture.cpp
View File

@ -1158,20 +1158,10 @@ void LLViewerFetchedTexture::dump()
// ONLY called from LLViewerFetchedTextureList
void LLViewerFetchedTexture::destroyTexture()
{
// <FS:Ansariel> 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 ;
}
// </FS:Ansariel>
if (mNeedsCreateTexture)//return if in the process of generating a new texture.
{
return ;