FIRE-21630: Make item count in confirm empty trash message match counting method for inventory (don't include folders)

Fri, 01 Dec 2017 10:39:43 +0100

author
Ansariel
date
Fri, 01 Dec 2017 10:39:43 +0100
changeset 53520
8ca179e02930
parent 53519
0a92f07b5b2c
child 53521
2deeb2ae6be4

FIRE-21630: Make item count in confirm empty trash message match counting method for inventory (don't include folders)

indra/newview/llinventorymodel.cpp file | annotate | diff | revisions
     1.1 --- a/indra/newview/llinventorymodel.cpp	Fri Dec 01 10:20:48 2017 +0100
     1.2 +++ b/indra/newview/llinventorymodel.cpp	Fri Dec 01 10:39:43 2017 +0100
     1.3 @@ -3493,7 +3493,10 @@
     1.4  			LLInventoryModel::item_array_t items;
     1.5  			const LLUUID trash_id = findCategoryUUIDForType(preferred_type);
     1.6  			gInventory.collectDescendents(trash_id, cats, items, LLInventoryModel::INCLUDE_TRASH); //All descendants
     1.7 -			S32 item_count = items.size() + cats.size();
     1.8 +			// <FS:Ansariel> FIRE-21630: Make item count match counting method for inventory (don't include folders)
     1.9 +			//S32 item_count = items.size() + cats.size();
    1.10 +			S32 item_count = items.size();
    1.11 +			// </FS:Ansariel>
    1.12  			args["COUNT"] = item_count;
    1.13  		}
    1.14  		LLNotificationsUtil::add(notification, args, LLSD(),

mercurial