diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-12-02 14:48:45 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-12-02 14:48:45 -0500 |
| commit | 6cffbfba8b7dd1f6752fb2b4a93265906e9aeb9c (patch) | |
| tree | 3e4fc80698d063e8fa6d1ee9a652970e04014ecd /indra/newview/llagentwearables.h | |
| parent | 04d9c91a5f27b554e733b77272c8c3afea458810 (diff) | |
| parent | 4f076daeff1bb626bb90a57cbe91660349ec62f1 (diff) | |
merge
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); |