EXP-872 PROGRESS -- Hide Inbox unless applicable

EXP-910 FIX -- Newness badge shown on suitcase inventory icon when InventoryDisplayInbox is set to False
EXP-895 FIX -- Selecting items in Marketplace Inbox does not change focus in inventory panel away from items selected in inventory panel

* Main inventory, outbox and inbox all clear the selection of the others when they gain focus
* The Fresh Item Count badge is no longer displayed on the inventory side tab button when the inbox is disabled
* The New Item Count text is no longer displayed.  (we will enable it again when freshness is supported)

1 files changed, 20 insertions, 0 deletions

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index bc4998dd0c..9f797eb147 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -193,6 +193,9 @@ BOOL LLPanelMainInventory::postBuild()
 	mMenuAdd->getChild<LLMenuItemGL>("Upload Animation")->setLabelArg("[COST]", upload_cost);
 	mMenuAdd->getChild<LLMenuItemGL>("Bulk Upload")->setLabelArg("[COST]", upload_cost);
 
+	// Trigger callback for focus received so we can deselect items in inbox/outbox
+	LLFocusableElement::setFocusReceivedCallback(boost::bind(&LLPanelMainInventory::onFocusReceived, this));
+
 	return TRUE;
 }
 
@@ -572,6 +575,23 @@ void LLPanelMainInventory::updateItemcountText()
 	getChild<LLUICtrl>("ItemcountText")->setValue(text);
 }
 
+void LLPanelMainInventory::onFocusReceived()
+{
+	LLInventoryPanel * inbox_panel = findChild<LLInventoryPanel>("inventory_inbox");
+
+	if (inbox_panel)
+	{
+		inbox_panel->clearSelection();
+	}
+
+	LLInventoryPanel * outbox_panel = findChild<LLInventoryPanel>("inventory_outbox");
+
+	if (outbox_panel)
+	{
+		outbox_panel->clearSelection();
+	}
+}
+
 void LLPanelMainInventory::setFilterTextFromFilter() 
 { 
 	mFilterText = mActivePanel->getFilter()->getFilterText();