diff options
| author | Bradley Payne <vir@lindenlab.com> | 2009-09-10 18:42:19 +0000 |
|---|---|---|
| committer | Bradley Payne <vir@lindenlab.com> | 2009-09-10 18:42:19 +0000 |
| commit | 73d152093dd5bb31ad264afdd3dc8e283dff49e3 (patch) | |
| tree | f69a7b99e675affb4bd4b3cab248b425caaf5566 /indra/newview/llagentwearables.h | |
| parent | 3dfa1e4ab9da0d2a5d48ea771877fc16fdd73ad5 (diff) | |
For DEV-34223: Avatar Pipeline Project - M6 (Current Outfit Folder, Appearance Side Panel) - brought merge branch changes from avatar-pipeline/viewer-2.0.0-3_cwf-7_merge into viewer-2.0.0-3.
svn merge -r132878:132947 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/viewer-2.0.0-3_cwf-7_merge
Diffstat (limited to 'indra/newview/llagentwearables.h')
| -rw-r--r-- | indra/newview/llagentwearables.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llagentwearables.h b/indra/newview/llagentwearables.h index b415ef9eb3..cb4de555d5 100644 --- a/indra/newview/llagentwearables.h +++ b/indra/newview/llagentwearables.h @@ -182,6 +182,7 @@ public: static void userRemoveWearable(void* userdata); // userdata is EWearableType static void userRemoveAllClothes(void* userdata); // userdata is NULL static void userRemoveAllAttachments(void* userdata); // userdata is NULL + static void userAttachMultipleAttachments(LLInventoryModel::item_array_t& obj_item_array); BOOL itemUpdatePending(const LLUUID& item_id) const; U32 itemUpdatePendingCount() const; |