summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.cpp
diff options
context:
space:
mode:
authorleslie@leslie-HPz600.lindenlab.com <leslie@leslie-HPz600.lindenlab.com>2011-08-30 16:18:34 -0700
committerleslie@leslie-HPz600.lindenlab.com <leslie@leslie-HPz600.lindenlab.com>2011-08-30 16:18:34 -0700
commitf1c01becf27ab92a39c90d725c5bc70c73286e65 (patch)
treeac327ea9fa61594feaeea8912ebdd49cd8fe301d /indra/newview/llinventorybridge.cpp
parentdc919956194376bcb6e21eca7f0375c400a2ad5f (diff)
EXP-857 PROGRESS -- Add context menu entries as alternate path to populate outbox
* Folders containing items being worn now have the "Copy to Marketplace" context menu item disabled.
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
-rw-r--r--indra/newview/llinventorybridge.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index f3429607e9..fb5d145637 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -1098,6 +1098,13 @@ BOOL LLInvFVBridge::canListOnMarketplaceNow() const
return FALSE;
}
+ // Loop through all items worn by avatar and check to see if they are descendants
+ // of the item we are trying to list on the marketplace
+ if (get_is_parent_to_worn_item(mUUID))
+ {
+ return FALSE;
+ }
+
return TRUE;
}