summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2011-06-23 10:34:44 -0400
committerLeslie Linden <leslie@lindenlab.com>2011-06-23 10:34:44 -0400
commitc61a7fbaace20415be3003eaab95ce359ff8621a (patch)
tree96dabd7df719499ac5cf093e939f9653ee86b57b /indra
parentb84881382b265a7e4fad1b03dfb935992880ce70 (diff)
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
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llpanelmarketplaceinbox.cpp4
1 files changed, 4 insertions, 0 deletions
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