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

DD-394 : Make sure Copy and Move to Marketplace menu items are disabled if the Marketplace listing folder doesn't exist

master
Merov Linden 2015-05-02 14:16:26 -07:00
parent 3748d2f6dc
commit 7da083e3e6
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
indra/newview/llinventorybridge.cpp
View File

@ -1490,16 +1490,23 @@ bool LLInvFVBridge::canListOnMarketplaceNow() const
std::string error_msg;
LLInventoryModel* model = getInventoryModel();
const LLUUID &marketplacelistings_id = model->findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS, false);
LLViewerInventoryCategory * master_folder = model->getCategory(marketplacelistings_id);
LLInventoryCategory *cat = model->getCategory(mUUID);
if (cat)
if (marketplacelistings_id.notNull())
{
can_list = can_move_folder_to_marketplace(master_folder, master_folder, cat, error_msg);
LLViewerInventoryCategory * master_folder = model->getCategory(marketplacelistings_id);
LLInventoryCategory *cat = model->getCategory(mUUID);
if (cat)
{
can_list = can_move_folder_to_marketplace(master_folder, master_folder, cat, error_msg);
}
else
{
LLInventoryItem *item = model->getItem(mUUID);
can_list = (item ? can_move_item_to_marketplace(master_folder, master_folder, item, error_msg) : false);
}
}
else
{
LLInventoryItem *item = model->getItem(mUUID);
can_list = (item ? can_move_item_to_marketplace(master_folder, master_folder, item, error_msg) : false);
can_list = false;
}
}
}