diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-05-26 18:22:15 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-05-26 18:22:15 -0400 |
| commit | b2433a6c82980e76dfde8735d69b788d20abc9d8 (patch) | |
| tree | 56598d9bec26b54d3ba1a3896ac2cf52c2af139f /indra/newview/llagentwearables.h | |
| parent | 14b8471d448a6e591ab29d25634a32d882853212 (diff) | |
| parent | ec7dbc704040dfcdcd101f090dbb2f780ca0ee8a (diff) | |
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
Diffstat (limited to 'indra/newview/llagentwearables.h')
| -rw-r--r-- | indra/newview/llagentwearables.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llagentwearables.h b/indra/newview/llagentwearables.h index 1f19d1045b..c53b1333fc 100644 --- a/indra/newview/llagentwearables.h +++ b/indra/newview/llagentwearables.h @@ -91,6 +91,7 @@ public: const LLUUID getWearableItemID(LLWearableType::EType type, U32 index /*= 0*/) const; const LLUUID getWearableAssetID(LLWearableType::EType type, U32 index /*= 0*/) const; const LLWearable* getWearableFromItemID(const LLUUID& item_id) const; + LLWearable* getWearableFromItemID(const LLUUID& item_id); LLWearable* getWearableFromAssetID(const LLUUID& asset_id); LLInventoryItem* getWearableInventoryItem(LLWearableType::EType type, U32 index /*= 0*/); static BOOL selfHasWearable(LLWearableType::EType type); |