diff options
| author | James Cook <james@lindenlab.com> | 2010-05-26 10:53:59 -0700 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-05-26 10:53:59 -0700 |
| commit | 0ebdba45f6fbcecfe0aa63bb37ddcde2efba6d87 (patch) | |
| tree | dcfb58e0756c0034075345363559e068f53e8f2a /indra/newview/llagentwearables.h | |
| parent | dd672e6dfbe6347e7498fb32b9cade6a2133f4a8 (diff) | |
| parent | 74279f551b84a409af52634df4b7d78294a818dc (diff) | |
Merge with dessie/viewer-public to get Callum's webkit changes
Diffstat (limited to 'indra/newview/llagentwearables.h')
| -rw-r--r-- | indra/newview/llagentwearables.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/indra/newview/llagentwearables.h b/indra/newview/llagentwearables.h index 734bd9fd47..1f19d1045b 100644 --- a/indra/newview/llagentwearables.h +++ b/indra/newview/llagentwearables.h @@ -71,17 +71,18 @@ protected: public: BOOL isWearingItem(const LLUUID& item_id) const; BOOL isWearableModifiable(LLWearableType::EType type, U32 index /*= 0*/) const; + BOOL isWearableModifiable(const LLUUID& item_id) const; + BOOL isWearableCopyable(LLWearableType::EType type, U32 index /*= 0*/) const; BOOL areWearablesLoaded() const; void updateWearablesLoaded(); void checkWearablesLoaded() const; + bool canMoveWearable(const LLUUID& item_id, bool closer_to_body); // Note: False for shape, skin, eyes, and hair, unless you have MORE than 1. bool canWearableBeRemoved(const LLWearable* wearable) const; void animateAllWearableParams(F32 delta, BOOL upload_bake); - - bool moveWearable(const LLViewerInventoryItem* item, bool closer_to_body); //-------------------------------------------------------------------- // Accessors @@ -96,6 +97,7 @@ public: LLWearable* getWearable(const LLWearableType::EType type, U32 index /*= 0*/); const LLWearable* getWearable(const LLWearableType::EType type, U32 index /*= 0*/) const; LLWearable* getTopWearable(const LLWearableType::EType type); + LLWearable* getBottomWearable(const LLWearableType::EType type); U32 getWearableCount(const LLWearableType::EType type) const; U32 getWearableCount(const U32 tex_index) const; @@ -134,6 +136,14 @@ protected: void recoverMissingWearableDone(); //-------------------------------------------------------------------- + // Editing/moving wearables + //-------------------------------------------------------------------- + +public: + static void editWearable(const LLUUID& item_id); + bool moveWearable(const LLViewerInventoryItem* item, bool closer_to_body); + + //-------------------------------------------------------------------- // Removing wearables //-------------------------------------------------------------------- public: |