diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2017-05-19 18:47:20 +0300 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2017-05-19 18:47:20 +0300 |
| commit | c7dde30435c578b8fd4606135193e3ec8d31bd76 (patch) | |
| tree | ca72152a79ef40912847350bea597269de600cc6 /indra/newview/llinventorypanel.cpp | |
| parent | ed249c13af3509645089b280d3a594c29c216f68 (diff) | |
MAINT-7424 Fixed number of items in the Trash not calculating correctly
Diffstat (limited to 'indra/newview/llinventorypanel.cpp')
| -rw-r--r-- | indra/newview/llinventorypanel.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp index 5a7881fe49..ba2dce1f98 100644 --- a/indra/newview/llinventorypanel.cpp +++ b/indra/newview/llinventorypanel.cpp @@ -1224,7 +1224,10 @@ void LLInventoryPanel::purgeSelectedItems() ++it) { LLUUID item_id = static_cast<LLFolderViewModelItemInventory*>((*it)->getViewModelItem())->getUUID(); - count += gInventory.getDescendentsCountRecursive(item_id, trash_max_capacity); + LLInventoryModel::cat_array_t cats; + LLInventoryModel::item_array_t items; + gInventory.collectDescendents(item_id, cats, items, LLInventoryModel::INCLUDE_TRASH); + count += items.size() + cats.size(); } args["COUNT"] = count; LLNotificationsUtil::add("PurgeSelectedItems", args, LLSD(), boost::bind(&LLInventoryPanel::callbackPurgeSelectedItems, this, _1, _2)); |