MAINT-5282: I've removed most of the depricated Merchant Outbox code and the links to it in the menus. Also removed the Outbox Floater and made the folder always hidden if empty in inventory.

(There may still be some outstanding Outbox code that was not obvious that I have missed.)

1 files changed, 14 insertions, 10 deletions

diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 5194cba891..02d378bc51 100755
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -1437,16 +1437,20 @@ BOOL LLInventoryPanel::handleKeyHere( KEY key, MASK mask )
 		// Open selected items if enter key hit on the inventory panel
 		if (mask == MASK_NONE)
 		{
-			//Don't allow attaching or opening items from Merchant Outbox
-			LLFolderViewItem* folder_item = mFolderRoot.get()->getCurSelectedItem();
-			if(folder_item)
-			{
-				LLInvFVBridge* bridge = (LLInvFVBridge*)folder_item->getViewModelItem();
-				if(bridge && bridge->isOutboxFolder() && (bridge->getInventoryType() != LLInventoryType::IT_CATEGORY))
-				{
-					return handled;
-				}
-			}
+
+// @TODO$: Rider: This code is dead with Outbox, however should something similar be 
+//  done for VMM?
+//  
+// 			//Don't allow attaching or opening items from Merchant Outbox
+// 			LLFolderViewItem* folder_item = mFolderRoot.get()->getCurSelectedItem();
+// 			if(folder_item)
+// 			{
+// 				LLInvFVBridge* bridge = (LLInvFVBridge*)folder_item->getViewModelItem();
+// 				if(bridge && bridge->is() && (bridge->getInventoryType() != LLInventoryType::IT_CATEGORY))
+// 				{
+// 					return handled;
+// 				}
+// 			}
 
 			LLInventoryAction::doToSelected(mInventory, mFolderRoot.get(), "open");
 			handled = TRUE;