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


From 5d2d22322527bf303d24c15fde15025c045b7654 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Thu, 3 Nov 2011 15:11:29 -0700
Subject: EXP-1538 FIX -- New tags shown for items in subfolders in received
 items panel which remain after minimizing parent folder

* "new" tag determination for LLInboxFolderViewItem is now done on "addToFolder" rather than at construction time
  to avoid computing "new" for items not directly in the top level folder.
---
 indra/newview/llpanelmarketplaceinboxinventory.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/llpanelmarketplaceinboxinventory.h b/indra/newview/llpanelmarketplaceinboxinventory.h
index 09b14ec547..d6b827ee3e 100644
--- a/indra/newview/llpanelmarketplaceinboxinventory.h
+++ b/indra/newview/llpanelmarketplaceinboxinventory.h
@@ -69,7 +69,7 @@ public:
 	};
 	
 	LLInboxFolderViewFolder(const Params& p);
-
+	
 	void draw();
 	
 	void selectItem();
@@ -102,6 +102,7 @@ public:
 
 	LLInboxFolderViewItem(const Params& p);
 
+	BOOL addToFolder(LLFolderViewFolder* folder, LLFolderView* root);
 	BOOL handleDoubleClick(S32 x, S32 y, MASK mask);
 
 	void draw();
@@ -114,8 +115,6 @@ public:
 	bool isFresh() const { return mFresh; }
 
 protected:
-	void setCreationDate(time_t creation_date_utc);
-
 	bool mFresh;
 };
 
-- 
cgit v1.2.3