MAINT-5443 FIXED Appearance menu does not display gestures in outfit

7 files changed, 18 insertions, 5 deletions

diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 142a3250c8..53ae3c62ec 100755
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -1869,7 +1869,7 @@ bool LLAppearanceMgr::canAddWearables(const uuid_vec_t& item_ids)
 		{
 			++n_clothes;
 		}
-		else if (item->getType() == LLAssetType::AT_BODYPART)
+		else if (item->getType() == LLAssetType::AT_BODYPART || item->getType() == LLAssetType::AT_GESTURE)
 		{
 			return isAgentAvatarValid();
 		}
diff --git a/indra/newview/llcofwearables.cpp b/indra/newview/llcofwearables.cpp
index 8ce5aca909..307f93e28c 100755
--- a/indra/newview/llcofwearables.cpp
+++ b/indra/newview/llcofwearables.cpp
@@ -483,7 +483,7 @@ void LLCOFWearables::populateAttachmentsAndBodypartsLists(const LLInventoryModel
 		const LLAssetType::EType item_type = item->getType();
 		if (item_type == LLAssetType::AT_CLOTHING) continue;
 		LLPanelInventoryListItemBase* item_panel = NULL;
-		if (item_type == LLAssetType::AT_OBJECT)
+		if (item_type == LLAssetType::AT_OBJECT || item_type == LLAssetType::AT_GESTURE)
 		{
 			item_panel = buildAttachemntListItem(item);
 			mAttachments->addItem(item_panel, item->getUUID(), ADD_BOTTOM, false);
diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp
index 496168229d..01a22df9e1 100755
--- a/indra/newview/llpaneloutfitedit.cpp
+++ b/indra/newview/llpaneloutfitedit.cpp
@@ -1059,6 +1059,9 @@ void LLPanelOutfitEdit::filterWearablesBySelectedItem(void)
 		case LLAssetType::AT_BODYPART:
 			applyListViewFilter(LVIT_BODYPART);
 			break;
+		case LLAssetType::AT_GESTURE:
+			applyListViewFilter(LVIT_GESTURES);
+			break;
 		case LLAssetType::AT_CLOTHING:
 		default:
 			applyListViewFilter(LVIT_CLOTHING);
diff --git a/indra/newview/llpaneloutfitedit.h b/indra/newview/llpaneloutfitedit.h
index 30870daf40..841bb4337a 100755
--- a/indra/newview/llpaneloutfitedit.h
+++ b/indra/newview/llpaneloutfitedit.h
@@ -80,6 +80,7 @@ public:
 	{
 		LVIT_ALL = 0,
 		LVIT_CLOTHING,
+		LVIT_GESTURES,
 		LVIT_BODYPART,
 		LVIT_ATTACHMENT,
 		LVIT_SHAPE,
diff --git a/indra/newview/llpanelwearing.cpp b/indra/newview/llpanelwearing.cpp
index 75e0ed3741..d86a8b4480 100755
--- a/indra/newview/llpanelwearing.cpp
+++ b/indra/newview/llpanelwearing.cpp
@@ -131,7 +131,7 @@ protected:
 			{
 				bp_selected = true;
 			}
-			else if (type == LLAssetType::AT_OBJECT)
+			else if (type == LLAssetType::AT_OBJECT || type == LLAssetType::AT_GESTURE)
 			{
 				attachments_selected = true;
 			}
diff --git a/indra/newview/llwearableitemslist.cpp b/indra/newview/llwearableitemslist.cpp
index 1c3808ce68..f8981d0c51 100755
--- a/indra/newview/llwearableitemslist.cpp
+++ b/indra/newview/llwearableitemslist.cpp
@@ -35,6 +35,7 @@
 #include "llappearancemgr.h"
 #include "llinventoryfunctions.h"
 #include "llinventoryicon.h"
+#include "llgesturemgr.h"
 #include "lltransutil.h"
 #include "llviewerattachmenu.h"
 #include "llvoavatarself.h"
@@ -55,7 +56,8 @@ bool LLFindOutfitItems::operator()(LLInventoryCategory* cat,
 	{
 		if((item->getType() == LLAssetType::AT_CLOTHING)
 		   || (item->getType() == LLAssetType::AT_BODYPART)
-		   || (item->getType() == LLAssetType::AT_OBJECT))
+		   || (item->getType() == LLAssetType::AT_OBJECT)
+		   || (item->getType() == LLAssetType::AT_GESTURE))
 		{
 			return TRUE;
 		}
@@ -491,6 +493,7 @@ LLWearableItemTypeNameComparator::LLWearableItemTypeNameComparator()
 	mWearableOrder[LLAssetType::AT_CLOTHING] = LLWearableTypeOrder(ORDER_RANK_1, false, false);
 	mWearableOrder[LLAssetType::AT_OBJECT]   = LLWearableTypeOrder(ORDER_RANK_2, true, true);
 	mWearableOrder[LLAssetType::AT_BODYPART] = LLWearableTypeOrder(ORDER_RANK_3, false, true);
+	mWearableOrder[LLAssetType::AT_GESTURE] = LLWearableTypeOrder(ORDER_RANK_4, true, false);
 }
 
 void LLWearableItemTypeNameComparator::setOrder(LLAssetType::EType items_of_type,  LLWearableItemTypeNameComparator::ETypeListOrder order_priority, bool sort_asset_items_by_name, bool sort_wearable_items_by_name)
@@ -989,6 +992,10 @@ void LLWearableItemsList::ContextMenu::updateMask(U32& mask, LLAssetType::EType
 	{
 		mask |= MASK_ATTACHMENT;
 	}
+	else if (at == LLAssetType::AT_GESTURE)
+	{
+		mask |= MASK_GESTURE;
+	}
 	else
 	{
 		mask |= MASK_UNKNOWN;
diff --git a/indra/newview/llwearableitemslist.h b/indra/newview/llwearableitemslist.h
index e6788ab249..df4b1a8a50 100755
--- a/indra/newview/llwearableitemslist.h
+++ b/indra/newview/llwearableitemslist.h
@@ -310,6 +310,7 @@ public:
 		ORDER_RANK_1 = 1,
 		ORDER_RANK_2,
 		ORDER_RANK_3,
+		ORDER_RANK_4,
 		ORDER_RANK_UNKNOWN
 	};
 
@@ -419,7 +420,8 @@ public:
 			MASK_CLOTHING		= 0x01,
 			MASK_BODYPART		= 0x02,
 			MASK_ATTACHMENT		= 0x04,
-			MASK_UNKNOWN		= 0x08,
+			MASK_GESTURE		= 0x08,
+			MASK_UNKNOWN		= 0x16,
 		};
 
 		/* virtual */ LLContextMenu* createMenu();