summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2011-12-19 13:58:36 -0800
committerLeslie Linden <leslie@lindenlab.com>2011-12-19 13:58:36 -0800
commita0929f39caba9c2b7be8184f217c8e2a811857eb (patch)
treefd9681e041672d23eb3967ceb3cc1275b6a92df0 /indra
parentac01fb0e0378476fd572ba24151d73840f119519 (diff)
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.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llinventorybridge.cpp6
1 files changed, 6 insertions, 0 deletions
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()))