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

SL-9733 Fixed missed removal updates and reenabled trash folder

meow-7.2.2
andreykproductengine 2018-10-12 17:49:21 +03:00
parent efb45915a1
commit a209d207d3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llinventorypanel.cpp
View File

@ -1781,7 +1781,6 @@ void LLAssetFilteredInventoryPanel::initFromParams(const Params& p)
mAssetType = LLAssetType::lookup(p.filter_asset_type.getValue());
LLInventoryPanel::initFromParams(p);
U64 filter_cats = getFilter().getFilterCategoryTypes();
filter_cats &= ~(1ULL << LLFolderType::FT_TRASH);
filter_cats &= ~(1ULL << LLFolderType::FT_MARKETPLACE_LISTINGS);
getFilter().setFilterCategoryTypes(filter_cats);
getFilter().setFilterNoMarketplaceFolder();
@ -1806,12 +1805,15 @@ LLFolderViewItem* LLAssetFilteredInventoryPanel::buildNewViews(const LLUUID& id)
void LLAssetFilteredInventoryPanel::itemChanged(const LLUUID& id, U32 mask, const LLInventoryObject* model_item)
{
if (!model_item)
if (!model_item && !getItemByID(id))
{
// remove operation, but item is not in panel already
return;
}
if (model_item->getType() != mAssetType && model_item->getType() != LLAssetType::AT_CATEGORY)
if (model_item
&& model_item->getType() != mAssetType
&& model_item->getType() != LLAssetType::AT_CATEGORY)
{
return;
}