diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-17 11:41:12 -0700 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-17 11:41:12 -0700 |
| commit | 738dde2053479696ac0b4a18996c3046bb55b196 (patch) | |
| tree | 52160a99161c58d9330d41ac8dd57be355f332b3 /indra/newview/llvoavatarself.h | |
| parent | 2683006ff4a8325bc884a2861220b08964e7eaad (diff) | |
| parent | e43d9e57d652b95a422e3de9d78bc89c547a75ce (diff) | |
(final?) hairy merge from viewer-release to viewer-public
Diffstat (limited to 'indra/newview/llvoavatarself.h')
| -rw-r--r-- | indra/newview/llvoavatarself.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h index 630afe7a0f..21c815a70c 100644 --- a/indra/newview/llvoavatarself.h +++ b/indra/newview/llvoavatarself.h @@ -291,10 +291,18 @@ protected: public: void updateAttachmentVisibility(U32 camera_mode); BOOL isWearingAttachment(const LLUUID& inv_item_id) const; + BOOL attachmentWasRequested(const LLUUID& inv_item_id) const; + void addAttachmentRequest(const LLUUID& inv_item_id); + void removeAttachmentRequest(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); + static BOOL detachAttachmentIntoInventory(const LLUUID& item_id); + +private: + // Track attachments that have been requested but have not arrived yet. + mutable std::map<LLUUID,LLTimer> mAttachmentRequests; //-------------------------------------------------------------------- // HUDs |