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

Try to plug the profile icon memory hole

master
Ansariel 2016-02-13 11:26:38 +01:00
parent a5ac0e850a
commit e46ba2a706
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/llrender/llgltexture.cpp
View File

@ -130,6 +130,13 @@ 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

@ -1266,7 +1266,10 @@ void LLViewerFetchedTexture::setDeletionCandidate()
//set the texture inactive
void LLViewerFetchedTexture::setInactive()
{
if(mTextureState == ACTIVE && mGLTexturep.notNull() && mGLTexturep->getTexName() && !mGLTexturep->getBoundRecently())
// <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>
{
mTextureState = INACTIVE;
}