diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2015-07-15 16:06:46 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2015-07-15 16:06:46 +0300 |
| commit | 246758a3b70256f2c776d5372296b858251fd820 (patch) | |
| tree | 8cb8ab5ec368fd94e2d16e617d31bce8bced7694 /indra/newview/llvoavatarself.h | |
| parent | 8e2ec992d0bc937f72f6a1e96592f32798daac29 (diff) | |
| parent | 02441157a0d22619ccf2a2ee735c8f5251b54fdb (diff) | |
Merge downstream code and become version 3.8.2
Diffstat (limited to 'indra/newview/llvoavatarself.h')
| -rwxr-xr-x | indra/newview/llvoavatarself.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h index dc5e64d547..332a6353ad 100755 --- a/indra/newview/llvoavatarself.h +++ b/indra/newview/llvoavatarself.h @@ -291,19 +291,12 @@ 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); bool getAttachedPointName(const LLUUID& inv_item_id, std::string& name) 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 //-------------------------------------------------------------------- |