diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-10-21 23:08:48 +0000 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-10-21 23:08:48 +0000 |
| commit | 67c4555a3793850ca8a8142b1e3e72c90d5001f4 (patch) | |
| tree | 4ba917e75afd155c7090ba9b5ed876bb8f9556cc /indra/newview/llvoavatarself.h | |
| parent | 5cb23717816ca7420c6eb5471dbbd386438929cb (diff) | |
svn merge -r136533:136919 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/avatar-pipeline-14 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
* Bugs: EXT-1779
Diffstat (limited to 'indra/newview/llvoavatarself.h')
| -rw-r--r-- | indra/newview/llvoavatarself.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h index 9e0fa87e1f..aaa261cea7 100644 --- a/indra/newview/llvoavatarself.h +++ b/indra/newview/llvoavatarself.h @@ -266,8 +266,10 @@ protected: **/ public: - /*virtual*/ BOOL isWearingWearableType(EWearableType type ) const; + /*virtual*/ BOOL isWearingWearableType(EWearableType type) const; void wearableUpdated(EWearableType type); +protected: + U32 getNumWearables(LLVOAvatarDefines::ETextureIndex i) const; //-------------------------------------------------------------------- // Attachments @@ -275,17 +277,18 @@ public: public: void updateAttachmentVisibility(U32 camera_mode); BOOL isWearingAttachment(const LLUUID& inv_item_id, BOOL include_linked_items = FALSE) const; - LLViewerObject* getWornAttachment(const LLUUID& inv_item_id ); + LLViewerObject* getWornAttachment(const LLUUID& inv_item_id); const std::string getAttachedPointName(const LLUUID& inv_item_id) const; /*virtual*/ const LLViewerJointAttachment *attachObject(LLViewerObject *viewer_object); + /*virtual*/ BOOL detachObject(LLViewerObject *viewer_object); void getAllAttachmentsArray(LLDynamicArray<S32>& attachments); +protected: + const LLUUID& getBaseAttachmentObject(const LLUUID &object_id) const; //-------------------------------------------------------------------- // HUDs //-------------------------------------------------------------------- private: - U32 getNumWearables(LLVOAvatarDefines::ETextureIndex i) const; - LLViewerJoint* mScreenp; // special purpose joint for HUD attachments /** Attachments |