From 142e8edcd334b6119a74a7ce93c9823ad82bc052 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Mon, 16 Jun 2014 14:35:23 -0400
Subject: [PATCH] correct merge mistake
---
indra/newview/llappearancemgr.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index fe9dde4a433..6797dab8395 100755
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -1483,7 +1483,7 @@ void LLAppearanceMgr::takeOffOutfit(const LLUUID& cat_id)
// deactivate all gestures in the outfit folder
LLInventoryModel::item_array_t gest_items;
- getDescendentsOfAssetType(cat_id, gest_items, LLAssetType::AT_GESTURE, false);
+ getDescendentsOfAssetType(cat_id, gest_items, LLAssetType::AT_GESTURE);
for(S32 i = 0; i < gest_items.size(); ++i)
{
LLViewerInventoryItem *gest_item = gest_items[i];
--
GitLab