diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-06-07 10:31:50 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-06-07 10:31:50 -0400 |
commit | b1e9c9bab085c55bab217a641716a40b8d44ed9e (patch) | |
tree | 1f66e51960d9e96c49030fb61f7547c8e95cc244 /indra/newview/llinventorymodel.cpp | |
parent | 82f8be5ca32d60704819b26f0323351d4bbb9b04 (diff) | |
parent | aaf296c2cec420d6f1b3623e1413e71b00cf3966 (diff) |
automated merge
Diffstat (limited to 'indra/newview/llinventorymodel.cpp')
-rw-r--r-- | indra/newview/llinventorymodel.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index 2e1c5238d3..6fc5804a48 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -35,6 +35,7 @@ #include "llagent.h" #include "llagentwearables.h" +#include "llappearancemgr.h" #include "llinventorypanel.h" #include "llinventorybridge.h" #include "llinventoryfunctions.h" @@ -2561,7 +2562,7 @@ void LLInventoryModel::processBulkUpdateInventory(LLMessageSystem* msg, void**) { LLViewerInventoryItem* wearable_item; wearable_item = gInventory.getItem(wearable_ids[i]); - wear_inventory_item_on_avatar(wearable_item); + LLAppearanceMgr::instance().wearItemOnAvatar(wearable_item->getUUID(), true, true); } } |