diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 126f38464..2aa836a7b 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -5597,11 +5597,13 @@ void move_wearable_item(LLViewerInventoryItem* item, bool closer_to_body)
 	else
 	{
 		LLInventoryModel::item_array_t items;
+		LLInventoryModel::cat_array_t cats;
+		LLLinkedItemIDMatches is_linked_item_match(item->getUUID());
 		gInventory.collectDescendentsIf(LLAppearanceMgr::instance().getCOF(),
-										LLInventoryModel::cat_array_t(),
+										cats,
 										items,
 										LLInventoryModel::EXCLUDE_TRASH,
-										LLLinkedItemIDMatches(item->getUUID()));
+										is_linked_item_match);
 		if(!items.empty())
 		{
 			if(LLAppearanceMgr::instance().moveWearable(gInventory.getItem(items.front()->getUUID()),closer_to_body))
diff --git a/indra/newview/llpaneleditwearable.cpp b/indra/newview/llpaneleditwearable.cpp
index 953d4c243..6052bf7f3 100644
--- a/indra/newview/llpaneleditwearable.cpp
+++ b/indra/newview/llpaneleditwearable.cpp
@@ -61,47 +61,6 @@
 
 #include "llwearablelist.h"
 
-// subparts of the UI for focus, camera position, etc.
-enum ESubpart {
-        SUBPART_SHAPE_HEAD = 1, // avoid 0
-        SUBPART_SHAPE_EYES,
-        SUBPART_SHAPE_EARS,
-        SUBPART_SHAPE_NOSE,
-        SUBPART_SHAPE_MOUTH,
-        SUBPART_SHAPE_CHIN,
-        SUBPART_SHAPE_TORSO,
-        SUBPART_SHAPE_LEGS,
-        SUBPART_SHAPE_WHOLE,
-        SUBPART_SHAPE_DETAIL,
-        SUBPART_SKIN_COLOR,
-        SUBPART_SKIN_FACEDETAIL,
-        SUBPART_SKIN_MAKEUP,
-        SUBPART_SKIN_BODYDETAIL,
-        SUBPART_HAIR_COLOR,
-        SUBPART_HAIR_STYLE,
-        SUBPART_HAIR_EYEBROWS,
-        SUBPART_HAIR_FACIAL,
-        SUBPART_EYES,
-        SUBPART_SHIRT,
-        SUBPART_PANTS,
-        SUBPART_SHOES,
-        SUBPART_SOCKS,
-        SUBPART_JACKET,
-        SUBPART_GLOVES,
-        SUBPART_UNDERSHIRT,
-        SUBPART_UNDERPANTS,
-        SUBPART_SKIRT,
-        SUBPART_ALPHA,
-        SUBPART_TATTOO,
-        SUBPART_PHYSICS_BREASTS_UPDOWN,
-        SUBPART_PHYSICS_BREASTS_INOUT,
-        SUBPART_PHYSICS_BREASTS_LEFTRIGHT,
-        SUBPART_PHYSICS_BELLY_UPDOWN,
-        SUBPART_PHYSICS_BUTT_UPDOWN,
-        SUBPART_PHYSICS_BUTT_LEFTRIGHT,
-        SUBPART_PHYSICS_ADVANCED,
- };
-
 using namespace LLVOAvatarDefines;
 
 typedef std::vector<ESubpart> subpart_vec_t;
diff --git a/indra/newview/llpaneleditwearable.h b/indra/newview/llpaneleditwearable.h
index 412e6227b..4d80ac262 100644
--- a/indra/newview/llpaneleditwearable.h
+++ b/indra/newview/llpaneleditwearable.h
@@ -47,7 +47,47 @@ class LLLineEditor;
 class LLSubpart;
 class LLWearableSaveAsDialog;
 
-enum ESubpart;
+// subparts of the UI for focus, camera position, etc.
+enum ESubpart {
+        SUBPART_SHAPE_HEAD = 1, // avoid 0
+        SUBPART_SHAPE_EYES,
+        SUBPART_SHAPE_EARS,
+        SUBPART_SHAPE_NOSE,
+        SUBPART_SHAPE_MOUTH,
+        SUBPART_SHAPE_CHIN,
+        SUBPART_SHAPE_TORSO,
+        SUBPART_SHAPE_LEGS,
+        SUBPART_SHAPE_WHOLE,
+        SUBPART_SHAPE_DETAIL,
+        SUBPART_SKIN_COLOR,
+        SUBPART_SKIN_FACEDETAIL,
+        SUBPART_SKIN_MAKEUP,
+        SUBPART_SKIN_BODYDETAIL,
+        SUBPART_HAIR_COLOR,
+        SUBPART_HAIR_STYLE,
+        SUBPART_HAIR_EYEBROWS,
+        SUBPART_HAIR_FACIAL,
+        SUBPART_EYES,
+        SUBPART_SHIRT,
+        SUBPART_PANTS,
+        SUBPART_SHOES,
+        SUBPART_SOCKS,
+        SUBPART_JACKET,
+        SUBPART_GLOVES,
+        SUBPART_UNDERSHIRT,
+        SUBPART_UNDERPANTS,
+        SUBPART_SKIRT,
+        SUBPART_ALPHA,
+        SUBPART_TATTOO,
+        SUBPART_PHYSICS_BREASTS_UPDOWN,
+        SUBPART_PHYSICS_BREASTS_INOUT,
+        SUBPART_PHYSICS_BREASTS_LEFTRIGHT,
+        SUBPART_PHYSICS_BELLY_UPDOWN,
+        SUBPART_PHYSICS_BUTT_UPDOWN,
+        SUBPART_PHYSICS_BUTT_LEFTRIGHT,
+        SUBPART_PHYSICS_ADVANCED,
+ };
+
 using namespace LLVOAvatarDefines;
 
 class LLPanelEditWearable : public LLPanel