EXP-995 FIX -- New icon scrolls into Received Items panel heading

EXP-903 FIX -- Newness/Freshness number does not decrease as items are opened in Inbox

* Brought back freshness with the freshness
* New badge and label color from Gibson
* Inventory Panel now allows display of badges with proper clipping

Reviewed by Richard.

1 files changed, 5 insertions, 4 deletions

diff --git a/indra/newview/llpanelmarketplaceinbox.cpp b/indra/newview/llpanelmarketplaceinbox.cpp
index 28025f58d4..3accc43ab6 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,7 +37,7 @@
 #include "llviewercontrol.h"

 

 

-#define SUPPORTING_FRESH_ITEM_COUNT	0

+#define SUPPORTING_FRESH_ITEM_COUNT	1

 

 

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

@@ -159,10 +160,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++;

 				}