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

Backed out changeset 4bbf5275fe2e (Try to plug the profile icon memory hole) - This should be fixed now

master
Ansariel 2016-02-26 21:35:16 +01:00
parent 51f8b1ec7b
commit 5bcab38d0a
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/llrender/llgltexture.cpp
View File

@ -131,13 +131,6 @@ void LLGLTexture::setActive()
{
mTextureState = ACTIVE ;
}
// <FS:Ansariel> Try to plug the profile icon memory hole
if (mBoostLevel == BOOST_ICON)
{
setNoDelete();
}
// </FS:Ansariel>
}
//set the texture to stay in memory

5
indra/newview/llviewertexture.cpp
View File

@ -1294,10 +1294,7 @@ void LLViewerFetchedTexture::setDeletionCandidate()
//set the texture inactive
void LLViewerFetchedTexture::setInactive()
{
// <FS:Ansariel> Try to plug the profile icon memory hole
//if(mTextureState == ACTIVE && mGLTexturep.notNull() && mGLTexturep->getTexName() && !mGLTexturep->getBoundRecently())
if((mTextureState == ACTIVE || (mTextureState == NO_DELETE && mBoostLevel == BOOST_ICON)) && mGLTexturep.notNull() && mGLTexturep->getTexName() && !mGLTexturep->getBoundRecently())
// </FS:Ansariel>
if(mTextureState == ACTIVE && mGLTexturep.notNull() && mGLTexturep->getTexName() && !mGLTexturep->getBoundRecently())
{
mTextureState = INACTIVE;
}