summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2014-01-23 13:41:52 -0500
committerOz Linden <oz@lindenlab.com>2014-01-23 13:41:52 -0500
commitb2cc4feed2e1c1ffb6360225c0169577f2f8d1ee (patch)
tree638390b31bc935f1a89b14fd80e0f8d8c112c778
parent2af19a91d5e0c5832fcdd09d7d30b45ea44b1528 (diff)
correct coding style problems, add contribution credit
-rwxr-xr-xdoc/contributions.txt1
-rwxr-xr-xindra/newview/llappearancemgr.cpp8
2 files changed, 5 insertions, 4 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 2f9d0c2c86..9f86c56454 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -727,6 +727,7 @@ Kunnis Basiat
Lance Corrimal
STORM-1910
VWR-25269
+ STORM-2008
Latif Khalifa
VWR-5370
leliel Mirihi
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 4c98181ef3..c5e98915fc 100755
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -1431,12 +1431,12 @@ void LLAppearanceMgr::takeOffOutfit(const LLUUID& cat_id)
uuids_to_remove.push_back(item->getUUID());
}
removeItemsFromAvatar(uuids_to_remove);
- // now deactivating all gestures in that folder
+ // deactivate all gestures in the outfit folder
LLInventoryModel::item_array_t gest_items;
- getDescendentsOfAssetType(cat_id, gest_items, LLAssetType::AT_GESTURE, false);
- for(S32 i = 0; i < gest_items.count(); ++i)
- {
+ getDescendentsOfAssetType(cat_id, gest_items, LLAssetType::AT_GESTURE, false);
+ for(S32 i = 0; i < gest_items.count(); ++i)
+ {
LLViewerInventoryItem *gest_item = gest_items.get(i);
if ( LLGestureMgr::instance().isGestureActive( gest_item->getLinkedUUID()) )
{