merge changes for 3.6.12-release

1 files changed, 9 insertions, 0 deletions

diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h
index 46252afbde..5ec80f1cf0 100755
--- a/indra/newview/llappearancemgr.h
+++ b/indra/newview/llappearancemgr.h
@@ -142,6 +142,9 @@ public:
 	void removeAllClothesFromAvatar();
 	void removeAllAttachmentsFromAvatar();
 
+	// Special handling of temp attachments, which are not in the COF
+	bool shouldRemoveTempAttachment(const LLUUID& item_id);
+
 	//has the current outfit changed since it was loaded?
 	bool isOutfitDirty() { return mOutfitIsDirty; }
 
@@ -239,6 +242,12 @@ private:
 
 	std::auto_ptr<LLOutfitUnLockTimer> mUnlockOutfitTimer;
 
+	// Set of temp attachment UUIDs that should be removed
+	typedef std::set<LLUUID> doomed_temp_attachments_t;
+	doomed_temp_attachments_t	mDoomedTempAttachmentIDs;
+
+	void addDoomedTempAttachment(const LLUUID& id_to_remove);
+
 	//////////////////////////////////////////////////////////////////////////////////
 	// Item-specific convenience functions 
 public: