From c61a7fbaace20415be3003eaab95ce359ff8621a Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Thu, 23 Jun 2011 10:34:44 -0400 Subject: EXP-926 FIX -- Received items badge count and item count shown in inbox do not always match * getFreshItemCount() function returns getTotalItemCount() for now, until we properly support item fresh-ness --- indra/newview/llpanelmarketplaceinbox.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra') diff --git a/indra/newview/llpanelmarketplaceinbox.cpp b/indra/newview/llpanelmarketplaceinbox.cpp index 1962724891..14c4c46fe7 100644 --- a/indra/newview/llpanelmarketplaceinbox.cpp +++ b/indra/newview/llpanelmarketplaceinbox.cpp @@ -115,6 +115,7 @@ BOOL LLPanelMarketplaceInbox::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL dr U32 LLPanelMarketplaceInbox::getFreshItemCount() const { +#if SUPPORTING_FRESH_ITEM_COUNT U32 fresh_item_count = 0; LLFolderView * root_folder = mInventoryPanel->getRootFolder(); @@ -135,6 +136,9 @@ U32 LLPanelMarketplaceInbox::getFreshItemCount() const } return fresh_item_count; +#else + return getTotalItemCount(); +#endif } U32 LLPanelMarketplaceInbox::getTotalItemCount() const -- cgit v1.2.3