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

Add 'Delete from outfit' context menu entry

master
chanayane 2025-07-20 23:08:04 +02:00
parent adb9ce2a5c
commit 61cb7bae14
No known key found for this signature in database
GPG Key ID: F60C8AE3A90228FA
4 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/llinventoryfunctions.cpp
View File

@ -1170,6 +1170,22 @@ void reset_inventory_filter()
}
}
// <AS:Chanayane> Delete from outfit context menu entry
void delete_from_outfit(const uuid_vec_t& ids)
{
for (const LLUUID& item_uuid : ids)
{
LLViewerInventoryItem* item = gInventory.getItem(item_uuid);
if (item && item->getIsLinkType())
{
gInventory.removeItem(item_uuid);
}
}
}
// </AS:Chanayane>
void open_marketplace_listings()
{
LLFloaterReg::showInstance("marketplace_listings");

4
indra/newview/llinventoryfunctions.h
View File

@ -73,6 +73,10 @@ void show_task_item_profile(const LLUUID& item_uuid, const LLUUID& object_id);
void show_item_original(const LLUUID& item_uuid);
void reset_inventory_filter();
// <AS:Chanayane> Delete from outfit context menu entry
void delete_from_outfit(const uuid_vec_t& ids);
// </AS:Chanayane>
// Nudge the listing categories in the inventory to signal that their marketplace status changed
void update_marketplace_category(const LLUUID& cat_id, bool perform_consistency_enforcement = true, bool skip_clear_listing = false);
// Nudge all listing categories to signal that their marketplace status changed

7
indra/newview/llwearableitemslist.cpp
View File

@ -1141,6 +1141,9 @@ LLContextMenu* LLWearableItemsList::ContextMenu::createMenu()
registrar.add("Wearable.Edit", boost::bind(handle_item_edit, selected_id));
registrar.add("Wearable.CreateNew", boost::bind(createNewWearable, selected_id));
registrar.add("Wearable.ShowOriginal", boost::bind(show_item_original, selected_id));
// <AS:Chanayane> Delete from outfit context menu entry
registrar.add("Wearable.DeleteFromOutfit", boost::bind(delete_from_outfit, ids));
// </AS:Chanayane>
registrar.add("Wearable.TakeOffDetach",
//boost::bind(&LLAppearanceMgr::removeItemsFromAvatar, LLAppearanceMgr::getInstance(), ids, no_op)); // <FS:Ansariel> [SL:KB] - Patch: Appearance-Misc
boost::bind(&LLAppearanceMgr::removeItemsFromAvatar, LLAppearanceMgr::getInstance(), ids));
@ -1301,6 +1304,10 @@ void LLWearableItemsList::ContextMenu::updateItemsVisibility(LLContextMenu* menu
setMenuItemEnabled(menu, "create_new", LLAppearanceMgr::instance().canAddWearables(ids));
setMenuItemVisible(menu, "show_original", !standalone);
setMenuItemEnabled(menu, "show_original", n_items == 1 && n_links == n_items);
// <AS:Chanayane> Delete from outfit context menu entry
setMenuItemVisible(menu, "delete_from_outfit", n_links > 0);
setMenuItemEnabled(menu, "delete_from_outfit", n_links > 0);
// </AS:Chanayane>
setMenuItemVisible(menu, "take_off", mask == MASK_CLOTHING && n_worn == n_items);
setMenuItemVisible(menu, "detach", mask == MASK_ATTACHMENT && n_worn == n_items);
setMenuItemVisible(menu, "take_off_or_detach", mask == (MASK_ATTACHMENT|MASK_CLOTHING));

10
indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
View File

@ -91,6 +91,16 @@
function="RLV.EnableIfNot"
parameter="showinv"/>
</menu_item_call>
<!-- [AS:Chanayane] Delete from outfit context menu entry -->
<menu_item_call
label="Delete from outfit"
layout="topleft"
visible="false"
name="delete_from_outfit">
<on_click
function="Wearable.DeleteFromOutfit" />
</menu_item_call>
<!-- [/AS:Chanayane] -->
<menu_item_call
label="Create New"
layout="topleft"