From d86def6f03acc3b4a07a30a2f7912e6dc35edf27 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Mon, 31 Oct 2011 14:59:10 -0700
Subject: * Added support for items at the top level of "Received Items"
 instead of just   folders.  Top-level inbox items are counted both in the
 total item count and   in the fresh item count.

---
 indra/newview/llpanelmarketplaceinboxinventory.h | 36 ++++++++++++++++++------
 1 file changed, 28 insertions(+), 8 deletions(-)

(limited to 'indra/newview/llpanelmarketplaceinboxinventory.h')

diff --git a/indra/newview/llpanelmarketplaceinboxinventory.h b/indra/newview/llpanelmarketplaceinboxinventory.h
index 46eeb9ea7f..09b14ec547 100644
--- a/indra/newview/llpanelmarketplaceinboxinventory.h
+++ b/indra/newview/llpanelmarketplaceinboxinventory.h
@@ -69,16 +69,15 @@ public:
 	};
 	
 	LLInboxFolderViewFolder(const Params& p);
-	~LLInboxFolderViewFolder();
 
 	void draw();
 	
-	void computeFreshness();
-	void deFreshify();
-
 	void selectItem();
 	void toggleOpen();
 
+	void computeFreshness();
+	void deFreshify();
+
 	bool isFresh() const { return mFresh; }
 	
 protected:
@@ -88,15 +87,36 @@ protected:
 };
 
 
-class LLInboxFolderViewItem : public LLFolderViewItem
+class LLInboxFolderViewItem : public LLFolderViewItem, public LLBadgeOwner
 {
 public:
-	LLInboxFolderViewItem(const Params& p)
-		: LLFolderViewItem(p)
+	struct Params : public LLInitParam::Block<Params, LLFolderViewItem::Params>
 	{
-	}
+		Optional<LLBadge::Params>	new_badge;
+
+		Params()
+			: new_badge("new_badge")
+		{
+		}
+	};
+
+	LLInboxFolderViewItem(const Params& p);
 
 	BOOL handleDoubleClick(S32 x, S32 y, MASK mask);
+
+	void draw();
+
+	void selectItem();
+
+	void computeFreshness();
+	void deFreshify();
+
+	bool isFresh() const { return mFresh; }
+
+protected:
+	void setCreationDate(time_t creation_date_utc);
+
+	bool mFresh;
 };
 
 #endif //LL_INBOXINVENTORYPANEL_H
-- 
cgit v1.2.3