diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-31 16:47:35 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-31 16:47:35 -0400 |
| commit | 4047349ade461fa6bac43da2a14c6e7689918aa1 (patch) | |
| tree | c1414bf26449ede2ff338b8ab286c19b754697fe /indra/newview/llagentwearables.h | |
| parent | 4aad5ee313f580e08f9689b7ff4c4c088c20f831 (diff) | |
| parent | 67316ada5a51e1dc1e4d40a805312dddaa653ae2 (diff) | |
merge out latest viewer-autobuild2010 changes
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); |