DD-76 : Do not allow Calling Cards in Marketplace Listings

2 files changed, 13 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);
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 10a5ac4bc7..e63aca67f8 100755
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -1129,6 +1129,16 @@ void validate_marketplacelistings(LLInventoryCategory* cat, validation_callback_
             }
             continue;
         }
+        if (viewer_inv_item->getType() == LLAssetType::AT_CALLINGCARD)
+        {
+            std::string message = "    Error : calling cards are not allowed in listings : " + viewer_inv_item->getName();
+            llinfos << "Merov : Validation error : " << message << llendl;
+            if (cb)
+            {
+                cb(message);
+            }
+            continue;
+        }
         // Update the appropriate vector item for that type
         LLInventoryType::EType type = LLInventoryType::IT_COUNT;    // Default value for non stock items
         if (!viewer_inv_item->getPermissions().allowOperationBy(PERM_COPY, gAgent.getID(), gAgent.getGroupID()))