summaryrefslogtreecommitdiff
path: root/indra/newview/llappearancemgr.cpp
diff options
context:
space:
mode:
authorsimon <none@none>2014-07-07 16:17:53 -0700
committersimon <none@none>2014-07-07 16:17:53 -0700
commitbfa42c9e28075cb35f80e6fce7d1db0443027052 (patch)
treeb4e209e91cd173473f3c2033487647c5eb8c6b5d /indra/newview/llappearancemgr.cpp
parent114f7b5d0f46dfcbc9a94c1907e396b6e02700f6 (diff)
parent3e6698073cedc8b24068147cf6b7091f081ea125 (diff)
Merge downstream code and become 3.7.12
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
-rwxr-xr-xindra/newview/llappearancemgr.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 11bb81d8ff..61b8071cf9 100755
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -1481,15 +1481,15 @@ void LLAppearanceMgr::takeOffOutfit(const LLUUID& cat_id)
}
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);
- for (S32 i = 0; i < gest_items.size(); ++i)
+ for(S32 i = 0; i < gest_items.size(); ++i)
{
LLViewerInventoryItem *gest_item = gest_items[i];
- if (LLGestureMgr::instance().isGestureActive(gest_item->getLinkedUUID()))
+ if ( LLGestureMgr::instance().isGestureActive( gest_item->getLinkedUUID()) )
{
- LLGestureMgr::instance().deactivateGesture(gest_item->getLinkedUUID());
+ LLGestureMgr::instance().deactivateGesture( gest_item->getLinkedUUID() );
}
}
}