merge

1 files changed, 4 insertions, 6 deletions

diff --git a/indra/newview/llpanelmarketplaceinbox.cpp b/indra/newview/llpanelmarketplaceinbox.cpp
index 6db52e8f25..771b9c2f8f 100644
--- a/indra/newview/llpanelmarketplaceinbox.cpp
+++ b/indra/newview/llpanelmarketplaceinbox.cpp
@@ -27,6 +27,7 @@
 #include "llviewerprecompiledheaders.h"

 

 #include "llpanelmarketplaceinbox.h"

+#include "llpanelmarketplaceinboxinventory.h"

 

 #include "llappviewer.h"

 #include "llbutton.h"

@@ -36,9 +37,6 @@
 #include "llviewercontrol.h"

 

 

-#define SUPPORTING_FRESH_ITEM_COUNT	0

-

-

 static LLRegisterPanelClassWrapper<LLPanelMarketplaceInbox> t_panel_marketplace_inbox("panel_marketplace_inbox");

 

 const LLPanelMarketplaceInbox::Params& LLPanelMarketplaceInbox::getDefaultParams() 

@@ -159,10 +157,10 @@ U32 LLPanelMarketplaceInbox::getFreshItemCount() const
 

 			for (; folders_it != folders_end; ++folders_it)

 			{

-				const LLFolderViewFolder * folder = *folders_it;

+				const LLFolderViewFolder * folder_view = *folders_it;

+				const LLInboxFolderViewFolder * inbox_folder_view = dynamic_cast<const LLInboxFolderViewFolder*>(folder_view);

 

-				// TODO: Replace this check with new "fresh" flag

-				if (folder->getCreationDate() > 1500)

+				if (inbox_folder_view && inbox_folder_view->isFresh())

 				{

 					fresh_item_count++;

 				}