1 files changed, 69 insertions, 7 deletions

diff --git a/indra/newview/llwearableitemslist.cpp b/indra/newview/llwearableitemslist.cpp
index e7bbee5efd..9acc0f8d2f 100644
--- a/indra/newview/llwearableitemslist.cpp
+++ b/indra/newview/llwearableitemslist.cpp
@@ -38,6 +38,7 @@
 #include "llgesturemgr.h"
 #include "lltransutil.h"
 #include "llviewerattachmenu.h"
+#include "llviewermenu.h"
 #include "llvoavatarself.h"
 
 class LLFindOutfitItems : public LLInventoryCollectFunctor
@@ -639,6 +640,7 @@ LLWearableItemsList::LLWearableItemsList(const LLWearableItemsList::Params& p)
 :	LLInventoryItemsList(p)
 {
 	setSortOrder(E_SORT_BY_TYPE_LAYER, false);
+	mMenuWearableType = LLWearableType::WT_NONE;
 	mIsStandalone = p.standalone;
 	if (mIsStandalone)
 	{
@@ -730,10 +732,15 @@ void LLWearableItemsList::onRightClick(S32 x, S32 y)
 	getSelectedUUIDs(selected_uuids);
 	if (selected_uuids.empty())
 	{
-		return;
+		if ((mMenuWearableType != LLWearableType::WT_NONE) && (size() == 0))
+		{
+			ContextMenu::instance().show(this, mMenuWearableType, x, y);
+		}
+	}
+	else
+	{
+		ContextMenu::instance().show(this, selected_uuids, x, y);
 	}
-
-	ContextMenu::instance().show(this, selected_uuids, x, y);
 }
 
 void LLWearableItemsList::setSortOrder(ESortOrder sort_order, bool sort_now)
@@ -784,6 +791,46 @@ void LLWearableItemsList::ContextMenu::show(LLView* spawning_view, const uuid_ve
 	mParent = NULL; // to avoid dereferencing an invalid pointer
 }
 
+void LLWearableItemsList::ContextMenu::show(LLView* spawning_view, LLWearableType::EType w_type, S32 x, S32 y)
+{
+	mParent = dynamic_cast<LLWearableItemsList*>(spawning_view);
+	LLContextMenu* menup = mMenuHandle.get();
+	if (menup)
+	{
+		//preventing parent (menu holder) from deleting already "dead" context menus on exit
+		LLView* parent = menup->getParent();
+		if (parent)
+		{
+			parent->removeChild(menup);
+		}
+		delete menup;
+		mUUIDs.clear();
+	}
+
+	LLUICtrl::CommitCallbackRegistry::ScopedRegistrar registrar;
+    registrar.add("Wearable.CreateNew", boost::bind(createNewWearableByType, w_type));
+	menup = createFromFile("menu_wearable_list_item.xml");
+	if (!menup)
+	{
+		LL_WARNS() << "Context menu creation failed" << LL_ENDL;
+		return;
+	}
+	setMenuItemVisible(menup, "create_new", true);
+	setMenuItemEnabled(menup, "create_new", true);
+	setMenuItemVisible(menup, "wearable_attach_to", false);
+	setMenuItemVisible(menup, "wearable_attach_to_hud", false);
+
+	std::string new_label = LLTrans::getString("create_new_" + LLWearableType::getTypeName(w_type));
+	LLMenuItemGL* menu_item = menup->getChild<LLMenuItemGL>("create_new");
+	menu_item->setLabel(new_label);
+
+	mMenuHandle = menup->getHandle();
+	menup->show(x, y);
+	LLMenuGL::showPopup(spawning_view, menup, x, y);
+
+	mParent = NULL; // to avoid dereferencing an invalid pointer
+}
+
 // virtual
 LLContextMenu* LLWearableItemsList::ContextMenu::createMenu()
 {
@@ -794,7 +841,7 @@ LLContextMenu* LLWearableItemsList::ContextMenu::createMenu()
 	// Register handlers common for all wearable types.
 	registrar.add("Wearable.Wear", boost::bind(wear_multiple, ids, true));
 	registrar.add("Wearable.Add", boost::bind(wear_multiple, ids, false));
-	registrar.add("Wearable.Edit", boost::bind(handleMultiple, LLAgentWearables::editWearable, ids));
+	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));
 	registrar.add("Wearable.TakeOffDetach", 
@@ -809,6 +856,7 @@ LLContextMenu* LLWearableItemsList::ContextMenu::createMenu()
 	// Register handlers for attachments.
 	registrar.add("Attachment.Detach", 
 				  boost::bind(&LLAppearanceMgr::removeItemsFromAvatar, LLAppearanceMgr::getInstance(), ids));
+	registrar.add("Attachment.Touch", boost::bind(handle_attachment_touch, selected_id));
 	registrar.add("Attachment.Profile", boost::bind(show_item_profile, selected_id));
 	registrar.add("Object.Attach", boost::bind(LLViewerAttachMenu::attachObjects, ids, _2));
 
@@ -838,6 +886,7 @@ void LLWearableItemsList::ContextMenu::updateItemsVisibility(LLContextMenu* menu
 	U32 n_already_worn = 0;			// number of items worn of same type as selected items
 	U32 n_links = 0;				// number of links among the selected items
 	U32 n_editable = 0;				// number of editable items among the selected ones
+	U32 n_touchable = 0;            // number of touchable items among the selected ones
 
 	bool can_be_worn = true;
 
@@ -858,12 +907,17 @@ void LLWearableItemsList::ContextMenu::updateItemsVisibility(LLContextMenu* menu
 		const LLWearableType::EType wearable_type = item->getWearableType();
 		const bool is_link = item->getIsLinkType();
 		const bool is_worn = get_is_item_worn(id);
-		const bool is_editable = gAgentWearables.isWearableModifiable(id);
+		const bool is_editable = get_is_item_editable(id);
+		const bool is_touchable = enable_attachment_touch(id);
 		const bool is_already_worn = gAgentWearables.selfHasWearable(wearable_type);
 		if (is_worn)
 		{
 			++n_worn;
 		}
+		if (is_touchable)
+		{
+			++n_touchable;
+		}
 		if (is_editable)
 		{
 			++n_editable;
@@ -893,8 +947,10 @@ void LLWearableItemsList::ContextMenu::updateItemsVisibility(LLContextMenu* menu
 	setMenuItemEnabled(menu, "wear_add",			LLAppearanceMgr::instance().canAddWearables(ids));
 	setMenuItemVisible(menu, "wear_replace",		n_worn == 0 && n_already_worn != 0 && can_be_worn);
 	//visible only when one item selected and this item is worn
-	setMenuItemVisible(menu, "edit",				!standalone && mask & (MASK_CLOTHING|MASK_BODYPART) && n_worn == n_items && n_worn == 1);
-	setMenuItemEnabled(menu, "edit",				n_editable == 1 && n_worn == 1 && n_items == 1);
+	setMenuItemVisible(menu, "touch",				!standalone && mask == MASK_ATTACHMENT && n_worn == n_items);
+	setMenuItemEnabled(menu, "touch",				n_touchable && n_worn == 1 && n_items == 1);
+	setMenuItemVisible(menu, "edit",				!standalone && mask & (MASK_CLOTHING|MASK_BODYPART|MASK_ATTACHMENT) && n_worn == n_items);
+	setMenuItemEnabled(menu, "edit",				n_editable && n_worn == 1 && n_items == 1);
 	setMenuItemVisible(menu, "create_new",			mask & (MASK_CLOTHING|MASK_BODYPART) && n_items == 1);
 	setMenuItemEnabled(menu, "create_new",			LLAppearanceMgr::instance().canAddWearables(ids));
 	setMenuItemVisible(menu, "show_original",		!standalone);
@@ -1004,4 +1060,10 @@ void LLWearableItemsList::ContextMenu::createNewWearable(const LLUUID& item_id)
 	LLAgentWearables::createWearable(item->getWearableType(), true);
 }
 
+// static
+void LLWearableItemsList::ContextMenu::createNewWearableByType(LLWearableType::EType type)
+{
+	LLAgentWearables::createWearable(type, true);
+}
+
 // EOF