diff options
author | callum <none@none> | 2011-11-01 10:57:34 -0700 |
---|---|---|
committer | callum <none@none> | 2011-11-01 10:57:34 -0700 |
commit | 148e5f436dbb6f9126f1f6235e9056d4fb14ca66 (patch) | |
tree | 0e4c056382e0e2d0752c6ed2ceee25f528c30b61 /indra/newview/llpanelmarketplaceinbox.cpp | |
parent | 2777ddd0607caeeee16deae79ca8284bdaccd261 (diff) | |
parent | d86def6f03acc3b4a07a30a2f7912e6dc35edf27 (diff) |
merge with head
Diffstat (limited to 'indra/newview/llpanelmarketplaceinbox.cpp')
-rw-r--r-- | indra/newview/llpanelmarketplaceinbox.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/indra/newview/llpanelmarketplaceinbox.cpp b/indra/newview/llpanelmarketplaceinbox.cpp index ac528947a4..7cb4bbf891 100644 --- a/indra/newview/llpanelmarketplaceinbox.cpp +++ b/indra/newview/llpanelmarketplaceinbox.cpp @@ -151,6 +151,20 @@ U32 LLPanelMarketplaceInbox::getFreshItemCount() const fresh_item_count++; } } + + LLFolderViewFolder::items_t::const_iterator items_it = inbox_folder->getItemsBegin(); + LLFolderViewFolder::items_t::const_iterator items_end = inbox_folder->getItemsEnd(); + + for (; items_it != items_end; ++items_it) + { + const LLFolderViewItem * item_view = *items_it; + const LLInboxFolderViewItem * inbox_item_view = dynamic_cast<const LLInboxFolderViewItem*>(item_view); + + if (inbox_item_view && inbox_item_view->isFresh()) + { + fresh_item_count++; + } + } } } @@ -171,6 +185,7 @@ U32 LLPanelMarketplaceInbox::getTotalItemCount() const if (inbox_folder) { item_count += inbox_folder->getFoldersCount(); + item_count += inbox_folder->getItemsCount(); } } |