Backed out changeset 7848c0344c05 for extended fix by LL

Tue, 08 Mar 2016 08:52:36 +0100

author
Ansariel
date
Tue, 08 Mar 2016 08:52:36 +0100
changeset 48903
3c8cf8ecef3a
parent 48902
7848c0344c05
child 48916
3a87b4065448

Backed out changeset 7848c0344c05 for extended fix by LL

indra/newview/llviewertexturelist.cpp file | annotate | diff | revisions
     1.1 --- a/indra/newview/llviewertexturelist.cpp	Sat Feb 27 00:07:33 2016 +0100
     1.2 +++ b/indra/newview/llviewertexturelist.cpp	Tue Mar 08 08:52:36 2016 +0100
     1.3 @@ -1773,15 +1773,8 @@
     1.4  	LLUIImagePtr new_imagep = new LLUIImage(name, imagep);
     1.5  	new_imagep->setScaleStyle(scale_style);
     1.6  
     1.7 -	// <FS:Ansariel> Memory leak plugging: Don't add icon textures to the UI lists
     1.8 -	//mUIImages.insert(std::make_pair(name, new_imagep));
     1.9 -	//mUITextureList.push_back(imagep);
    1.10 -	if (imagep->getBoostLevel() != LLGLTexture::BOOST_ICON)
    1.11 -	{
    1.12 -		mUIImages.insert(std::make_pair(name, new_imagep));
    1.13 -		mUITextureList.push_back(imagep);
    1.14 -	}
    1.15 -	// </FS:Ansariel>
    1.16 +	mUIImages.insert(std::make_pair(name, new_imagep));
    1.17 +	mUITextureList.push_back(imagep);
    1.18  
    1.19  	//Note:
    1.20  	//Some other textures such as ICON also through this flow to be fetched.

mercurial