diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-04-29 12:03:03 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-04-29 12:03:03 -0700 |
| commit | 4deb9f54c64d114bfd2aba76e51eaa01908b6610 (patch) | |
| tree | 538d8c536d03c1255e2af62ebb505dc9faf42433 /indra/newview/llinventorybridge.cpp | |
| parent | eeccd4c381243eb8dbbafdbaf43f30eb74b96048 (diff) | |
DD-76 : Do not allow Calling Cards in Marketplace Listings
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rwxr-xr-x | indra/newview/llinventorybridge.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index e6ecd4e96e..97646dc949 100755 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -4408,7 +4408,10 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item, } else if (move_is_into_marketplacelistings) { + // Check stock folder type matches item type accept = (getCategory() && getCategory()->acceptItem(inv_item)); + // Do not accept calling cards in marketplace listings + accept &= (LLAssetType::AT_CALLINGCARD != inv_item->getType()); } LLInventoryPanel* active_panel = LLInventoryPanel::getActiveInventoryPanel(FALSE); |