MAINT-8342 FIXED [maint-viewer] Viewer crash when click Take off in Temporary attachments

Tue, 06 Mar 2018 11:32:28 +0200

author
maxim_productengine<mnikolenko@productengine.com>
date
Tue, 06 Mar 2018 11:32:28 +0200
changeset 55326
8285df44a039
parent 55324
b968bfa33629
child 55327
8c5ee35b0901

MAINT-8342 FIXED [maint-viewer] Viewer crash when click Take off in Temporary attachments

indra/newview/llpanelwearing.cpp file | annotate | diff | revisions
     1.1 --- a/indra/newview/llpanelwearing.cpp	Fri Mar 02 20:07:22 2018 +0200
     1.2 +++ b/indra/newview/llpanelwearing.cpp	Tue Mar 06 11:32:28 2018 +0200
     1.3 @@ -342,7 +342,11 @@
     1.4  		}
     1.5  		else
     1.6  		{
     1.7 -			return mTempItemsList->hasSelectedItem();
     1.8 +			LLScrollListItem* item = mTempItemsList->getFirstSelected();
     1.9 +			if (item && item->getUUID().notNull())
    1.10 +			{
    1.11 +				return true;
    1.12 +			}
    1.13  		}
    1.14  	}
    1.15  
    1.16 @@ -524,7 +528,7 @@
    1.17  void LLPanelWearing::onRemoveAttachment()
    1.18  {
    1.19  	LLScrollListItem* item = mTempItemsList->getFirstSelected();
    1.20 -	if (item)
    1.21 +	if (item && item->getUUID().notNull())
    1.22  	{
    1.23  		LLSelectMgr::getInstance()->deselectAll();
    1.24  		LLSelectMgr::getInstance()->selectObjectAndFamily(mAttachmentsMap[item->getUUID()]);

mercurial