diff options
| author | leyla <leyla@leyla.com> | 2010-06-02 11:24:40 -0700 |
|---|---|---|
| committer | leyla <leyla@leyla.com> | 2010-06-02 11:24:40 -0700 |
| commit | a282ffedf444462b71f5abc7aeac47768e7344e7 (patch) | |
| tree | 6634c6131809a23c3af36645ab220e97dd63f18e /indra/newview/llagentwearables.h | |
| parent | 507410b63d2e8f5193443a8d5451ccf614ac85e7 (diff) | |
| parent | 28d23e8c85ba6073cffbd3597342c43f4f9c7971 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llagentwearables.h')
| -rw-r--r-- | indra/newview/llagentwearables.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llagentwearables.h b/indra/newview/llagentwearables.h index 1f19d1045b..5d5c5ae371 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); @@ -101,6 +102,9 @@ public: U32 getWearableCount(const LLWearableType::EType type) const; U32 getWearableCount(const U32 tex_index) const; + static const U32 MAX_CLOTHING_PER_TYPE = 5; + + //-------------------------------------------------------------------- // Setters //-------------------------------------------------------------------- @@ -273,8 +277,6 @@ private: LLPointer<LLRefCount> mCB; }; - static const U32 MAX_WEARABLES_PER_TYPE = 1; - }; // LLAgentWearables extern LLAgentWearables gAgentWearables; |