diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-03 15:41:36 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-03 15:41:36 -0500 |
| commit | 1ffd7c99afe25da37a83a2a1dd8a03c7275a5f6b (patch) | |
| tree | ad40ea009c5ebea67dd5334d210d90b6dbeebbd3 /indra/newview/llappearancemgr.cpp | |
| parent | 202d86b15567a783bed55849a7cdc8ad8d8f874f (diff) | |
| parent | a9609ae1557a70e095088e0a9b6ef5564dfdb388 (diff) | |
automated merge for avp->avp
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
| -rw-r--r-- | indra/newview/llappearancemgr.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index c7f05d99f7..d91b9d7ea4 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -512,6 +512,21 @@ void LLAppearanceManager::updateCOF(const LLUUID& category, bool append) { const LLUUID cof = getCOF(); + // Deactivate currently active gestures in the COF, if replacing outfit + if (!append) + { + LLInventoryModel::item_array_t gest_items; + getDescendentsOfAssetType(cof, gest_items, LLAssetType::AT_GESTURE, false); + for(S32 i = 0; i < gest_items.count(); ++i) + { + LLViewerInventoryItem *gest_item = gest_items.get(i); + if ( LLGestureManager::instance().isGestureActive( gest_item->getLinkedUUID()) ) + { + LLGestureManager::instance().deactivateGesture( gest_item->getLinkedUUID() ); + } + } + } + // Collect and filter descendents to determine new COF contents. // - Body parts: always include COF contents as a fallback in case any |