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

Fri, 26 Feb 2016 21:35:16 +0100

author
Ansariel
date
Fri, 26 Feb 2016 21:35:16 +0100
changeset 48900
718971f529e5
parent 48899
c85f952a50b6
child 48901
58531e6fd11d

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

indra/llrender/llgltexture.cpp file | annotate | diff | revisions
indra/newview/llviewertexture.cpp file | annotate | diff | revisions
     1.1 --- a/indra/llrender/llgltexture.cpp	Fri Feb 26 21:34:32 2016 +0100
     1.2 +++ b/indra/llrender/llgltexture.cpp	Fri Feb 26 21:35:16 2016 +0100
     1.3 @@ -131,13 +131,6 @@
     1.4  	{
     1.5  		mTextureState = ACTIVE ; 
     1.6  	}
     1.7 -
     1.8 -	// <FS:Ansariel> Try to plug the profile icon memory hole
     1.9 -	if (mBoostLevel == BOOST_ICON)
    1.10 -	{
    1.11 -		setNoDelete();
    1.12 -	}
    1.13 -	// </FS:Ansariel>
    1.14  }
    1.15  
    1.16  //set the texture to stay in memory
     2.1 --- a/indra/newview/llviewertexture.cpp	Fri Feb 26 21:34:32 2016 +0100
     2.2 +++ b/indra/newview/llviewertexture.cpp	Fri Feb 26 21:35:16 2016 +0100
     2.3 @@ -1294,10 +1294,7 @@
     2.4  //set the texture inactive
     2.5  void LLViewerFetchedTexture::setInactive()
     2.6  {
     2.7 -	// <FS:Ansariel> Try to plug the profile icon memory hole
     2.8 -	//if(mTextureState == ACTIVE && mGLTexturep.notNull() && mGLTexturep->getTexName() && !mGLTexturep->getBoundRecently())
     2.9 -	if((mTextureState == ACTIVE || (mTextureState == NO_DELETE && mBoostLevel == BOOST_ICON)) && mGLTexturep.notNull() && mGLTexturep->getTexName() && !mGLTexturep->getBoundRecently())
    2.10 -	// </FS:Ansariel>
    2.11 +	if(mTextureState == ACTIVE && mGLTexturep.notNull() && mGLTexturep->getTexName() && !mGLTexturep->getBoundRecently())
    2.12  	{
    2.13  		mTextureState = INACTIVE; 
    2.14  	}

mercurial