SL-19334 Show item count info only for items in current folder in single-folder view

1 files changed, 11 insertions, 0 deletions

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 1eb2d5bbdc..6b9e04840d 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -825,6 +825,17 @@ void LLPanelMainInventory::updateItemcountText()
 	{
 		text = getString("ItemcountUnknown", string_args);
 	}
+
+    if (mSingleFolderMode)
+    {
+        LLInventoryModel::cat_array_t *cats;
+        LLInventoryModel::item_array_t *items;
+        gInventory.getDirectDescendentsOf(mSingleFolderPanelInventory->getSingleFolderRoot(), cats, items);
+    
+        string_args["[ITEM_COUNT]"] = llformat("%d", items->size());
+        string_args["[CATEGORY_COUNT]"] = llformat("%d", cats->size());
+        text = getString("ItemcountCompleted", string_args);
+    }
 	
     mCounterCtrl->setValue(text);
     mCounterCtrl->setToolTip(text);