livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

meow-7.2.2
Merov Linden 2014-04-29 12:03:03 -07:00
parent eeccd4c381
commit 4deb9f54c6
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llinventorybridge.cpp
View File

@ -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);

10
indra/newview/llinventoryfunctions.cpp
View File

@ -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()))