diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-07-14 18:54:37 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-07-14 18:54:37 -0400 |
| commit | f46526b16004e734d0a459e482ab9bb5df656c54 (patch) | |
| tree | 87c1390cc6b001cf1bc4e52c3dab52f152313c11 /indra/newview/llvoavatarself.h | |
| parent | c2f9c5ac8189b8076d51711c3be09dfbe309e22b (diff) | |
| parent | 02441157a0d22619ccf2a2ee735c8f5251b54fdb (diff) | |
merge changes for 3.8.1-release
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 73c5384b60..6737fead31 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 //-------------------------------------------------------------------- |