From 090d3097d569922b7c3b681cb77ff14a29a60b07 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Wed, 18 Mar 2015 21:41:47 -0400 Subject: MAINT-4917 WIP - Attachment deferred bulk COF linking WIP --- indra/newview/llvoavatarself.h | 7 ------- 1 file changed, 7 deletions(-) (limited to 'indra/newview/llvoavatarself.h') diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h index 5f36872575..c6a038f558 100755 --- a/indra/newview/llvoavatarself.h +++ b/indra/newview/llvoavatarself.h @@ -289,19 +289,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 mAttachmentRequests; - //-------------------------------------------------------------------- // HUDs //-------------------------------------------------------------------- -- cgit v1.2.3 From 5160aab492981eae5565c414dbe87070ea04f42d Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Tue, 24 Mar 2015 11:54:30 -0700 Subject: Fix viewer-release merge snaffu. Note that mInitialBakesLoaded (new in viewer-release) is not used and generates a compile error when using the new build tools --- indra/newview/llvoavatarself.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llvoavatarself.h') diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h index dc5e64d547..0ff96e0837 100755 --- a/indra/newview/llvoavatarself.h +++ b/indra/newview/llvoavatarself.h @@ -109,6 +109,7 @@ private: private: LLUUID mInitialBakeIDs[6]; + //bool mInitialBakesLoaded; /******************************************************************************** -- cgit v1.2.3