MAINT-2199 reverted previous change, refixed missing cloud and ban line

Thu, 03 Mar 2016 00:15:33 +0200

author
andreykproductengine
date
Thu, 03 Mar 2016 00:15:33 +0200
changeset 48910
c11071c1f802
parent 48906
3ba721d138ff
child 48914
9951ebb842b6

MAINT-2199 reverted previous change, refixed missing cloud and ban line

indra/newview/lllocalbitmaps.cpp file | annotate | diff | revisions
indra/newview/llpanelface.cpp file | annotate | diff | revisions
indra/newview/lltexturectrl.cpp file | annotate | diff | revisions
indra/newview/lltexturefetch.cpp file | annotate | diff | revisions
indra/newview/llviewerparcelmgr.cpp file | annotate | diff | revisions
indra/newview/llviewertexture.cpp file | annotate | diff | revisions
indra/newview/llviewertexturelist.cpp file | annotate | diff | revisions
indra/newview/llviewertexturelist.h file | annotate | diff | revisions
indra/newview/llvoavatar.cpp file | annotate | diff | revisions
     1.1 --- a/indra/newview/lllocalbitmaps.cpp	Mon Feb 29 18:09:25 2016 +0200
     1.2 +++ b/indra/newview/lllocalbitmaps.cpp	Thu Mar 03 00:15:33 2016 +0200
     1.3 @@ -135,7 +135,7 @@
     1.4  	}
     1.5  
     1.6  	// delete self from gimagelist
     1.7 -	LLViewerFetchedTexture* image = gTextureList.findImage(mWorldID, TEX_LIST_STANDARD);
     1.8 +	LLViewerFetchedTexture* image = gTextureList.findImage(mWorldID, TEX_LIST_DISCARD);
     1.9  	gTextureList.deleteImage(image);
    1.10  
    1.11  	if (image)
    1.12 @@ -207,7 +207,7 @@
    1.13  					texture->setCachedRawImage(LL_LOCAL_DISCARD_LEVEL, raw_image);
    1.14  					texture->ref(); 
    1.15  
    1.16 -					gTextureList.addImage(texture, TEX_LIST_STANDARD);
    1.17 +					gTextureList.addImage(texture, TEX_LIST_DISCARD);
    1.18  			
    1.19  					if (optional_firstupdate != UT_FIRSTUSE)
    1.20  					{
    1.21 @@ -215,7 +215,7 @@
    1.22  						replaceIDs(old_id, mWorldID);
    1.23  
    1.24  						// remove old_id from gimagelist
    1.25 -						LLViewerFetchedTexture* image = gTextureList.findImage(old_id, TEX_LIST_STANDARD);
    1.26 +						LLViewerFetchedTexture* image = gTextureList.findImage(old_id, TEX_LIST_DISCARD);
    1.27  						if (image != NULL)
    1.28  						{
    1.29  							gTextureList.deleteImage(image);
    1.30 @@ -384,7 +384,7 @@
    1.31  std::vector<LLViewerObject*> LLLocalBitmap::prepUpdateObjects(LLUUID old_id, U32 channel)
    1.32  {
    1.33  	std::vector<LLViewerObject*> obj_list;
    1.34 -	LLViewerFetchedTexture* old_texture = gTextureList.findImage(old_id, TEX_LIST_STANDARD);
    1.35 +	LLViewerFetchedTexture* old_texture = gTextureList.findImage(old_id, TEX_LIST_DISCARD);
    1.36  
    1.37  	for(U32 face_iterator = 0; face_iterator < old_texture->getNumFaces(channel); face_iterator++)
    1.38  	{
    1.39 @@ -502,7 +502,7 @@
    1.40  
    1.41  void LLLocalBitmap::updateUserSculpts(LLUUID old_id, LLUUID new_id)
    1.42  {
    1.43 -	LLViewerFetchedTexture* old_texture = gTextureList.findImage(old_id, TEX_LIST_STANDARD);
    1.44 +	LLViewerFetchedTexture* old_texture = gTextureList.findImage(old_id, TEX_LIST_DISCARD);
    1.45  	for(U32 volume_iter = 0; volume_iter < old_texture->getNumVolumes(); volume_iter++)
    1.46  	{
    1.47  		LLVOVolume* volume_to_object = (*old_texture->getVolumeList())[volume_iter];
     2.1 --- a/indra/newview/llpanelface.cpp	Mon Feb 29 18:09:25 2016 +0200
     2.2 +++ b/indra/newview/llpanelface.cpp	Thu Mar 03 00:15:33 2016 +0200
     2.3 @@ -2214,7 +2214,7 @@
     2.4  				LLTextureEntry *te = object->getTE(te_index);
     2.5  				if (te)
     2.6  				{
     2.7 -					LLViewerTexture* tex = te->getID().notNull() ? gTextureList.findImage(te->getID(), TEX_LIST_STANDARD) : NULL;
     2.8 +					LLViewerTexture* tex = te->getID().notNull() ? gTextureList.findImage(te->getID(), TEX_LIST_DISCARD) : NULL;
     2.9  					if(!tex)
    2.10  					{
    2.11  						tex = LLViewerFetchedTexture::sDefaultImagep;
     3.1 --- a/indra/newview/lltexturectrl.cpp	Mon Feb 29 18:09:25 2016 +0200
     3.2 +++ b/indra/newview/lltexturectrl.cpp	Thu Mar 03 00:15:33 2016 +0200
     3.3 @@ -1393,7 +1393,7 @@
     3.4  
     3.5  void	LLTextureCtrl::setImageAssetName(const std::string& name)
     3.6  {
     3.7 -	LLPointer<LLUIImage> imagep = LLUI::getUIImage(name, LLGLTexture::BOOST_PREVIEW);
     3.8 +	LLPointer<LLUIImage> imagep = LLUI::getUIImage(name);
     3.9  	if(imagep)
    3.10  	{
    3.11  		LLViewerFetchedTexture* pTexture = dynamic_cast<LLViewerFetchedTexture*>(imagep->getImage().get());
     4.1 --- a/indra/newview/lltexturefetch.cpp	Mon Feb 29 18:09:25 2016 +0200
     4.2 +++ b/indra/newview/lltexturefetch.cpp	Thu Mar 03 00:15:33 2016 +0200
     4.3 @@ -4460,7 +4460,7 @@
     4.4  			mRefetchedAllData += worker->mFormattedImage->getDataSize();
     4.5  
     4.6  			// refetch list only requests/creates normal images, so requesting ui='false'
     4.7 -			LLViewerFetchedTexture* tex = LLViewerTextureManager::findFetchedTexture(worker->mID, TEX_LIST_STANDARD);
     4.8 +			LLViewerFetchedTexture* tex = LLViewerTextureManager::findFetchedTexture(worker->mID, TEX_LIST_DISCARD);
     4.9  			if(tex && mRefetchList[tex].begin() != mRefetchList[tex].end())
    4.10  			{
    4.11  				if(worker->mDecodedDiscard == mFetchingHistory[mRefetchList[tex][0]].mDecodedLevel)
     5.1 --- a/indra/newview/llviewerparcelmgr.cpp	Mon Feb 29 18:09:25 2016 +0200
     5.2 +++ b/indra/newview/llviewerparcelmgr.cpp	Thu Mar 03 00:15:33 2016 +0200
     5.3 @@ -143,8 +143,8 @@
     5.4  	// JC: Resolved a merge conflict here, eliminated
     5.5  	// mBlockedImage->setAddressMode(LLTexUnit::TAM_WRAP);
     5.6  	// because it is done in llviewertexturelist.cpp
     5.7 -	mBlockedImage = LLViewerTextureManager::getFetchedTextureFromFile("world/NoEntryLines.png");
     5.8 -	mPassImage = LLViewerTextureManager::getFetchedTextureFromFile("world/NoEntryPassLines.png");
     5.9 +	mBlockedImage = LLViewerTextureManager::getFetchedTextureFromFile("world/NoEntryLines.png", FTT_LOCAL_FILE, TRUE, LLGLTexture::BOOST_UI);
    5.10 +	mPassImage = LLViewerTextureManager::getFetchedTextureFromFile("world/NoEntryPassLines.png", FTT_LOCAL_FILE, TRUE, LLGLTexture::BOOST_UI);
    5.11  
    5.12  	S32 overlay_size = mParcelsPerEdge * mParcelsPerEdge / PARCEL_OVERLAY_CHUNKS;
    5.13  	sPackedOverlay = new U8[overlay_size];
     6.1 --- a/indra/newview/llviewertexture.cpp	Mon Feb 29 18:09:25 2016 +0200
     6.2 +++ b/indra/newview/llviewertexture.cpp	Thu Mar 03 00:15:33 2016 +0200
     6.3 @@ -3322,7 +3322,7 @@
     6.4  
     6.5  	setCategory(LLGLTexture::MEDIA);
     6.6  	
     6.7 -	LLViewerTexture* tex = gTextureList.findImage(mID, TEX_LIST_STANDARD);
     6.8 +	LLViewerTexture* tex = gTextureList.findImage(mID, TEX_LIST_DISCARD);
     6.9  	if(tex) //this media is a parcel media for tex.
    6.10  	{
    6.11  		tex->setParcelMedia(this);
    6.12 @@ -3332,7 +3332,7 @@
    6.13  //virtual 
    6.14  LLViewerMediaTexture::~LLViewerMediaTexture() 
    6.15  {	
    6.16 -	LLViewerTexture* tex = gTextureList.findImage(mID, TEX_LIST_STANDARD);
    6.17 +	LLViewerTexture* tex = gTextureList.findImage(mID, TEX_LIST_DISCARD);
    6.18  	if(tex) //this media is a parcel media for tex.
    6.19  	{
    6.20  		tex->setParcelMedia(NULL);
    6.21 @@ -3387,7 +3387,7 @@
    6.22  
    6.23  	BOOL ret = TRUE;
    6.24  	
    6.25 -	LLViewerTexture* tex = gTextureList.findImage(mID, TEX_LIST_STANDARD);
    6.26 +	LLViewerTexture* tex = gTextureList.findImage(mID, TEX_LIST_DISCARD);
    6.27  	if(tex) //this media is a parcel media for tex.
    6.28  	{
    6.29  		for (U32 ch = 0; ch < LLRender::NUM_TEXTURE_CHANNELS; ++ch)
    6.30 @@ -3496,7 +3496,7 @@
    6.31  	const LLTextureEntry* te = facep->getTextureEntry();
    6.32  	if(te && te->getID().notNull())
    6.33  	{
    6.34 -		LLViewerTexture* tex = gTextureList.findImage(te->getID(), TEX_LIST_STANDARD);
    6.35 +		LLViewerTexture* tex = gTextureList.findImage(te->getID(), TEX_LIST_DISCARD);
    6.36  		if(tex)
    6.37  		{
    6.38  			mTextureList.push_back(tex);//increase the reference number by one for tex to avoid deleting it.
    6.39 @@ -3525,7 +3525,7 @@
    6.40  	const LLTextureEntry* te = facep->getTextureEntry();
    6.41  	if(te && te->getID().notNull())
    6.42  	{
    6.43 -		LLViewerTexture* tex = gTextureList.findImage(te->getID(), TEX_LIST_STANDARD);
    6.44 +		LLViewerTexture* tex = gTextureList.findImage(te->getID(), TEX_LIST_DISCARD);
    6.45  		if(tex)
    6.46  		{
    6.47  			for(std::list< LLPointer<LLViewerTexture> >::iterator iter = mTextureList.begin();
    6.48 @@ -3634,10 +3634,10 @@
    6.49  			const LLTextureEntry* te = facep->getTextureEntry();
    6.50  			if(te)
    6.51  			{
    6.52 -				LLViewerTexture* tex = te->getID().notNull() ? gTextureList.findImage(te->getID(), TEX_LIST_STANDARD) : NULL;
    6.53 +				LLViewerTexture* tex = te->getID().notNull() ? gTextureList.findImage(te->getID(), TEX_LIST_DISCARD) : NULL;
    6.54  				if(!tex && te->getID() != mID)//try parcel media.
    6.55  				{
    6.56 -					tex = gTextureList.findImage(mID, TEX_LIST_STANDARD);
    6.57 +					tex = gTextureList.findImage(mID, TEX_LIST_DISCARD);
    6.58  				}
    6.59  				if(!tex)
    6.60  				{
     7.1 --- a/indra/newview/llviewertexturelist.cpp	Mon Feb 29 18:09:25 2016 +0200
     7.2 +++ b/indra/newview/llviewertexturelist.cpp	Thu Mar 03 00:15:33 2016 +0200
     7.3 @@ -72,18 +72,20 @@
     7.4  
     7.5  ETexListType get_element_type(S32 priority)
     7.6  {
     7.7 -    if (priority == LLViewerFetchedTexture::BOOST_ICON)
     7.8 +    // don't discard flag can be used in some cases, but it usually is not set yet
     7.9 +    if (priority == LLViewerFetchedTexture::BOOST_ICON
    7.10 +        || priority == LLViewerFetchedTexture::BOOST_UI)
    7.11      {
    7.12 -        return TEX_LIST_SCALE;
    7.13 +        return TEX_LIST_UI;
    7.14      }
    7.15 -    return TEX_LIST_STANDARD;
    7.16 +    return TEX_LIST_DISCARD;
    7.17  }
    7.18  
    7.19  ///////////////////////////////////////////////////////////////////////////////
    7.20  
    7.21  LLTextureKey::LLTextureKey()
    7.22  : textureId(LLUUID::null),
    7.23 -textureType(TEX_LIST_STANDARD)
    7.24 +textureType(TEX_LIST_DISCARD)
    7.25  {
    7.26  }
    7.27  
    7.28 @@ -577,7 +579,7 @@
    7.29  
    7.30  void LLViewerTextureList::findTexturesByID(const LLUUID &image_id, std::vector<LLViewerFetchedTexture*> &output)
    7.31  {
    7.32 -    LLTextureKey search_key(image_id, TEX_LIST_STANDARD);
    7.33 +    LLTextureKey search_key(image_id, TEX_LIST_DISCARD);
    7.34      uuid_map_t::iterator iter = mUUIDMap.lower_bound(search_key);
    7.35      while (iter != mUUIDMap.end() && iter->first.textureId == image_id)
    7.36      {
    7.37 @@ -1583,14 +1585,14 @@
    7.38  	LLUUID image_id;
    7.39  	msg->getUUIDFast(_PREHASH_ImageID, _PREHASH_ID, image_id);
    7.40  	
    7.41 -	LLViewerFetchedTexture* image = gTextureList.findImage( image_id, TEX_LIST_STANDARD);
    7.42 +	LLViewerFetchedTexture* image = gTextureList.findImage( image_id, TEX_LIST_DISCARD);
    7.43  	if( image )
    7.44  	{
    7.45  		LL_WARNS() << "Image not in db" << LL_ENDL;
    7.46  		image->setIsMissingAsset();
    7.47  	}
    7.48  
    7.49 -    image = gTextureList.findImage(image_id, TEX_LIST_SCALE);
    7.50 +    image = gTextureList.findImage(image_id, TEX_LIST_UI);
    7.51      if (image)
    7.52      {
    7.53          LL_WARNS() << "Icon not in db" << LL_ENDL;
    7.54 @@ -1677,7 +1679,6 @@
    7.55  	//don't compress UI images
    7.56  	imagep->getGLTexture()->setAllowCompression(false);
    7.57  
    7.58 -
    7.59  	LLUIImagePtr new_imagep = new LLUIImage(name, imagep);
    7.60  	new_imagep->setScaleStyle(scale_style);
    7.61  
     8.1 --- a/indra/newview/llviewertexturelist.h	Mon Feb 29 18:09:25 2016 +0200
     8.2 +++ b/indra/newview/llviewertexturelist.h	Thu Mar 03 00:15:33 2016 +0200
     8.3 @@ -61,8 +61,8 @@
     8.4  
     8.5  enum ETexListType
     8.6  {
     8.7 -    TEX_LIST_STANDARD = 0,
     8.8 -    TEX_LIST_SCALE // images that will be scaled, they should not be mixed up with regular images
     8.9 +    TEX_LIST_DISCARD = 0,
    8.10 +    TEX_LIST_UI
    8.11  };
    8.12  
    8.13  struct LLTextureKey
     9.1 --- a/indra/newview/llvoavatar.cpp	Mon Feb 29 18:09:25 2016 +0200
     9.2 +++ b/indra/newview/llvoavatar.cpp	Thu Mar 03 00:15:33 2016 +0200
     9.3 @@ -1992,7 +1992,7 @@
     9.4  		uuid == IMG_INVISIBLE)
     9.5  	{
     9.6  		// Should already exist, don't need to find it on sim or baked-texture host.
     9.7 -		result = gTextureList.findImage(uuid, TEX_LIST_STANDARD);
     9.8 +		result = gTextureList.findImage(uuid, TEX_LIST_DISCARD);
     9.9  	}
    9.10  	if (!result)
    9.11  	{
    9.12 @@ -4313,7 +4313,7 @@
    9.13  {
    9.14  	for (std::set<LLUUID>::const_iterator it = ids.begin(); it != ids.end(); ++it)
    9.15  	{
    9.16 -		LLViewerFetchedTexture *imagep = gTextureList.findImage(*it, TEX_LIST_STANDARD);
    9.17 +		LLViewerFetchedTexture *imagep = gTextureList.findImage(*it, TEX_LIST_DISCARD);
    9.18  		if (imagep && imagep->getDiscardLevel()!=0)
    9.19  		{
    9.20  			return false;
    9.21 @@ -4385,7 +4385,7 @@
    9.22  	S32Bytes result(0);
    9.23  	for (std::set<LLUUID>::const_iterator it = ids.begin(); it != ids.end(); ++it)
    9.24  	{
    9.25 -		LLViewerFetchedTexture *imagep = gTextureList.findImage(*it, TEX_LIST_STANDARD);
    9.26 +		LLViewerFetchedTexture *imagep = gTextureList.findImage(*it, TEX_LIST_DISCARD);
    9.27  		if (imagep)
    9.28  		{
    9.29  			result += imagep->getTextureMemory();
    9.30 @@ -4473,7 +4473,7 @@
    9.31  	{
    9.32  		if (new_texture_ids.find(*it) == new_texture_ids.end())
    9.33  		{
    9.34 -			LLViewerFetchedTexture *imagep = gTextureList.findImage(*it, TEX_LIST_STANDARD);
    9.35 +			LLViewerFetchedTexture *imagep = gTextureList.findImage(*it, TEX_LIST_DISCARD);
    9.36  			if (imagep)
    9.37  			{
    9.38  				current_texture_mem += imagep->getTextureMemory();

mercurial