From ce45e5542a9d717caae83fe608ee5644e231d6a3 Mon Sep 17 00:00:00 2001
From: Leslie Linden <none@none>
Date: Wed, 13 Jul 2011 11:48:09 -0700
Subject: Disabled the fresh item count.  The badge on the suitcase button now
 once again reflects the total item count in the Received Items folder and the
 New badge is no longer initialized and will not be displayed.

Reviewed by Richard.
---
 indra/newview/llpanelmarketplaceinbox.cpp          | 3 ---
 indra/newview/llpanelmarketplaceinboxinventory.cpp | 4 ++++
 indra/newview/llpanelmarketplaceinboxinventory.h   | 5 +++++
 3 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llpanelmarketplaceinbox.cpp b/indra/newview/llpanelmarketplaceinbox.cpp
index 3accc43ab6..dd3daf5fbb 100644
--- a/indra/newview/llpanelmarketplaceinbox.cpp
+++ b/indra/newview/llpanelmarketplaceinbox.cpp
@@ -37,9 +37,6 @@
 #include "llviewercontrol.h"
 
 
-#define SUPPORTING_FRESH_ITEM_COUNT	1
-
-
 static LLRegisterPanelClassWrapper<LLPanelMarketplaceInbox> t_panel_marketplace_inbox("panel_marketplace_inbox");
 
 const LLPanelMarketplaceInbox::Params& LLPanelMarketplaceInbox::getDefaultParams() 
diff --git a/indra/newview/llpanelmarketplaceinboxinventory.cpp b/indra/newview/llpanelmarketplaceinboxinventory.cpp
index 8542ea2ae4..4ea6e98070 100644
--- a/indra/newview/llpanelmarketplaceinboxinventory.cpp
+++ b/indra/newview/llpanelmarketplaceinboxinventory.cpp
@@ -143,7 +143,9 @@ LLInboxFolderViewFolder::LLInboxFolderViewFolder(const Params& p)
 	, LLBadgeOwner(getHandle())
 	, mFresh(true)
 {
+#if SUPPORTING_FRESH_ITEM_COUNT
 	initBadgeParams(p.new_badge());
+#endif
 }
 
 LLInboxFolderViewFolder::~LLInboxFolderViewFolder()
@@ -166,12 +168,14 @@ time_t LLInboxFolderViewFolder::getCreationDate() const
 // virtual
 void LLInboxFolderViewFolder::draw()
 {
+#if SUPPORTING_FRESH_ITEM_COUNT
 	if (!badgeHasParent())
 	{
 		addBadgeToParentPanel();
 	}
 	
 	setBadgeVisibility(mFresh);
+#endif
 
 	LLFolderViewFolder::draw();
 }
diff --git a/indra/newview/llpanelmarketplaceinboxinventory.h b/indra/newview/llpanelmarketplaceinboxinventory.h
index 899e459896..e12508cff4 100644
--- a/indra/newview/llpanelmarketplaceinboxinventory.h
+++ b/indra/newview/llpanelmarketplaceinboxinventory.h
@@ -32,6 +32,11 @@
 #include "llinventorypanel.h"
 #include "llfolderviewitem.h"
 
+
+#define SUPPORTING_FRESH_ITEM_COUNT	0
+
+
+
 class LLInboxInventoryPanel : public LLInventoryPanel
 {
 public:
-- 
cgit v1.2.3