diff options
| author | Eric Tulla <tulla@lindenlab.com> | 2009-09-29 23:09:41 +0000 |
|---|---|---|
| committer | Eric Tulla <tulla@lindenlab.com> | 2009-09-29 23:09:41 +0000 |
| commit | 6d887be5895286f6b65ea751014f33bd9e0faac4 (patch) | |
| tree | c5e0a88ccc2666fd5720a84cd2bd505865886b31 /indra/newview/llagentwearables.h | |
| parent | 7dbf4d526a0dcb753ab17feaf7bee012aeb7229c (diff) | |
Syncing latest appearance work from avatar pipeline into viewer2.0.
Result of: (NO CONFLICTS)
svn merge -r 134301:134742 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-9 .
Diffstat (limited to 'indra/newview/llagentwearables.h')
| -rw-r--r-- | indra/newview/llagentwearables.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llagentwearables.h b/indra/newview/llagentwearables.h index f34b23e220..701ce7f05a 100644 --- a/indra/newview/llagentwearables.h +++ b/indra/newview/llagentwearables.h @@ -44,6 +44,7 @@ class LLInventoryItem; class LLVOAvatarSelf; class LLWearable; class LLInitialWearablesFetch; +class LLViewerObject; class LLAgentWearables { @@ -181,6 +182,11 @@ public: // MULTI-WEARABLE: assuming one wearable per type. Need upstream changes. static void userRemoveWearable(void* userdata); // userdata is EWearableType static void userRemoveAllClothes(void* userdata); // userdata is NULL + + typedef std::vector<LLViewerObject*> llvo_vec_t; + + static void userUpdateAttachments(LLInventoryModel::item_array_t& obj_item_array); + static void userRemoveMultipleAttachments(llvo_vec_t& llvo_array); static void userRemoveAllAttachments(); static void userAttachMultipleAttachments(LLInventoryModel::item_array_t& obj_item_array); |