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

DD-45 : Add Activate right click menu item to marketplace listings folders

meow-7.2.2
Merov Linden 2014-04-04 12:33:40 -07:00
parent c36b7fa963
commit 6263a4fe6f
3 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
indra/newview/llinventorybridge.cpp
View File

@ -744,6 +744,10 @@ void LLInvFVBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
{
addOutboxContextMenuOptions(flags, items, disabled_items);
}
else if (isMarketplaceListingsFolder())
{
addMarketplaceContextMenuOptions(flags, items, disabled_items);
}
else
{
items.push_back(std::string("Share"));
@ -845,6 +849,15 @@ void LLInvFVBridge::addOutboxContextMenuOptions(U32 flags,
#endif // ENABLE_MERCHANT_SEND_TO_MARKETPLACE_CONTEXT_MENU
}
void LLInvFVBridge::addMarketplaceContextMenuOptions(U32 flags,
menuentry_vec_t &items,
menuentry_vec_t &disabled_items)
{
items.push_back(std::string("Marketplace Separator"));
items.push_back(std::string("Marketplace Activate"));
}
// *TODO: remove this
BOOL LLInvFVBridge::startDrag(EDragAndDropType* type, LLUUID* id) const
{
@ -3069,6 +3082,15 @@ void LLFolderBridge::performAction(LLInventoryModel* model, std::string action)
restoreItem();
return;
}
else if ("marketplace_activate" == action)
{
if (!LLMarketplaceData::instance().isListed(mUUID))
{
LLMarketplaceData::instance().addTestItem(mUUID);
}
LLMarketplaceData::instance().setActivation(mUUID,true);
return;
}
#ifndef LL_RELEASE_FOR_DOWNLOAD
else if ("delete_system_folder" == action)
{
@ -3563,6 +3585,10 @@ void LLFolderBridge::buildContextMenuOptions(U32 flags, menuentry_vec_t& items
{
addOutboxContextMenuOptions(flags, items, disabled_items);
}
else if (isMarketplaceListingsFolder())
{
addMarketplaceContextMenuOptions(flags, items, disabled_items);
}
else if(isAgentInventory()) // do not allow creating in library
{
LLViewerInventoryCategory *cat = getCategory();

3
indra/newview/llinventorybridge.h
View File

@ -146,6 +146,9 @@ protected:
virtual void addOutboxContextMenuOptions(U32 flags,
menuentry_vec_t &items,
menuentry_vec_t &disabled_items);
virtual void addMarketplaceContextMenuOptions(U32 flags,
menuentry_vec_t &items,
menuentry_vec_t &disabled_items);
protected:
LLInvFVBridge(LLInventoryPanel* inventory, LLFolderView* root, const LLUUID& uuid);

8
indra/newview/skins/default/xui/en/menu_inventory.xml
View File

@ -726,6 +726,14 @@
parameter="send_to_marketplace" />
</menu_item_call>
<menu_item_call
label="Activate"
layout="topleft"
name="Marketplace Activate">
<menu_item_call.on_click
function="Inventory.DoToSelected"
parameter="marketplace_activate" />
</menu_item_call>
<menu_item_call
label="--no options--"
layout="topleft"
name="--no options--" />