diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-05-14 17:50:59 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-05-14 17:50:59 -0400 |
| commit | 487ca1bad37883be0325b564ab557a8f77575388 (patch) | |
| tree | a8e7c6163d18f41161f5477c8af31207d2b4eae2 /indra/newview/llagentwearables.h | |
| parent | 7b9708a2e3aede6faef04bd546c497dc68264f58 (diff) | |
v-r -> s-e merge WIP
Diffstat (limited to 'indra/newview/llagentwearables.h')
| -rwxr-xr-x | indra/newview/llagentwearables.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llagentwearables.h b/indra/newview/llagentwearables.h index 08d7de8a4c..cdb1bdbe05 100755 --- a/indra/newview/llagentwearables.h +++ b/indra/newview/llagentwearables.h @@ -103,7 +103,7 @@ private: /*virtual*/void wearableUpdated(LLWearable *wearable, BOOL removed); public: void setWearableItem(LLInventoryItem* new_item, LLViewerWearable* wearable, bool do_append = false); - void setWearableOutfit(const LLInventoryItem::item_array_t& items, const std::vector< LLViewerWearable* >& wearables, BOOL remove); + void setWearableOutfit(const LLInventoryItem::item_array_t& items, const std::vector< LLViewerWearable* >& wearables); void setWearableName(const LLUUID& item_id, const std::string& new_name); // *TODO: Move this into llappearance/LLWearableData ? void addLocalTextureObject(const LLWearableType::EType wearable_type, const LLAvatarAppearanceDefines::ETextureIndex texture_type, U32 wearable_index); |