diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-05 07:23:43 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-05 07:23:43 -0400 |
| commit | b5c834c6fdcee7d7238bebfc561ecee3ecca3589 (patch) | |
| tree | 327ccb1a74e828db62e8d19768ff953192d86f72 /indra/newview/llagentwearables.h | |
| parent | fa4359e571fb67aca651efc3403274cdf0bb2616 (diff) | |
| parent | 2787be7d3558c3ca1ed15863e875612b1b27ec78 (diff) | |
merge changes for STORM-1051
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); |