diff options
author | simon <none@none> | 2014-12-02 10:41:20 -0800 |
---|---|---|
committer | simon <none@none> | 2014-12-02 10:41:20 -0800 |
commit | 4f076daeff1bb626bb90a57cbe91660349ec62f1 (patch) | |
tree | f3f09166aa11060ba16847277201c55d0664c181 /indra/newview/llagentwearables.h | |
parent | 47423ad1a0d349f263ab1c2f0ceca299e418bbbc (diff) | |
parent | 147d1922450f289fe675dc6f0ccce9094db13b38 (diff) |
Merge downstream code and become 3.7.22
Diffstat (limited to 'indra/newview/llagentwearables.h')
-rwxr-xr-x | indra/newview/llagentwearables.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llagentwearables.h b/indra/newview/llagentwearables.h index cdb1bdbe05..1004482020 100755 --- a/indra/newview/llagentwearables.h +++ b/indra/newview/llagentwearables.h @@ -178,7 +178,10 @@ public: typedef std::vector<LLViewerObject*> llvo_vec_t; - static void userUpdateAttachments(LLInventoryModel::item_array_t& obj_item_array); + static void findAttachmentsAddRemoveInfo(LLInventoryModel::item_array_t& obj_item_array, + llvo_vec_t& objects_to_remove, + llvo_vec_t& objects_to_retain, + LLInventoryModel::item_array_t& items_to_add); static void userRemoveMultipleAttachments(llvo_vec_t& llvo_array); static void userAttachMultipleAttachments(LLInventoryModel::item_array_t& obj_item_array); |