From a0929f39caba9c2b7be8184f217c8e2a811857eb Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Mon, 19 Dec 2011 13:58:36 -0800
Subject: EXP-1170 FIX -- Right click context menu to Copy to Outbox shown if
 user is not a merchant

* The context menu option is no longer shown if the user does not have an outbox.
---
 indra/newview/llinventorybridge.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index d8e0529501..7665ad6e88 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -1087,6 +1087,12 @@ BOOL LLInvFVBridge::canListOnMarketplace() const
 	{
 		return FALSE;
 	}
+	
+	const LLUUID & outbox_id = getInventoryModel()->findCategoryUUIDForType(LLFolderType::FT_OUTBOX, false);
+	if (outbox_id.isNull())
+	{
+		return FALSE;
+	}
 
 	LLViewerInventoryItem * item = model->getItem(mUUID);
 	if (item && !item->getPermissions().allowOperationBy(PERM_TRANSFER, gAgent.getID()))
-- 
cgit v1.2.3