diff options
author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-07-12 16:22:59 -0400 |
---|---|---|
committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-07-12 16:22:59 -0400 |
commit | 83716055d9e9e04f5562f8ad5cc13648b51531e0 (patch) | |
tree | 05f5bad73b96ec6aea111da6e1e69c7ea454cc3f /indra/newview | |
parent | adf597e4c4a0fd2f8c7ddaad630fda646831b366 (diff) | |
parent | 2630252a9fb7e1bc884386546d9ba13da36b008c (diff) |
Automated merge with ssh://hg.lindenlab.com/q/viewer-release/
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/llappearancemgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 43f6be42b6..df048fef02 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -995,7 +995,7 @@ bool LLAppearanceMgr::wearItemOnAvatar(const LLUUID& item_id_to_wear, bool do_up { removeCOFItemLinks(gAgentWearables.getWearableItemID(item_to_wear->getWearableType(), wearable_count-1), false); } - addCOFItemLink(item_to_wear, do_update); + addCOFItemLink(item_to_wear, do_update, cb); } break; case LLAssetType::AT_BODYPART: |