diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-14 22:59:36 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-14 22:59:36 -0500 |
| commit | ad991346683c9e69d3e86b0e98275cb3fa47fb72 (patch) | |
| tree | 371029c497c6453734771abc0eebb8755b841ad8 /indra/newview/llagentwearables.h | |
| parent | 2027ce56a217b97848f5582a14f8ed81593a1f54 (diff) | |
| parent | efa42a6aab6d3ada198072c0e2be2b7d9b4e1eb5 (diff) | |
Automated merge with file:///Users/oz/Work/viewer-development
Diffstat (limited to 'indra/newview/llagentwearables.h')
| -rw-r--r-- | 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 d7e77a5a5b..3ef50f14da 100644 --- a/indra/newview/llagentwearables.h +++ b/indra/newview/llagentwearables.h @@ -124,7 +124,7 @@ public: void setWearableOutfit(const LLInventoryItem::item_array_t& items, const LLDynamicArray< LLWearable* >& wearables, BOOL remove); void setWearableName(const LLUUID& item_id, const std::string& new_name); void addLocalTextureObject(const LLWearableType::EType wearable_type, const LLVOAvatarDefines::ETextureIndex texture_type, U32 wearable_index); - U32 getWearableIndex(LLWearable *wearable); + U32 getWearableIndex(const LLWearable *wearable) const; protected: void setWearableFinal(LLInventoryItem* new_item, LLWearable* new_wearable, bool do_append = false); |