Backed out changeset a62bf7c0af21

Backing out this merge that I pushed (prematurely) to the wrong place.

1 files changed, 3 insertions, 7 deletions

diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h
index bcc2cb164f..c3c1b2d106 100644
--- a/indra/newview/llviewerobject.h
+++ b/indra/newview/llviewerobject.h
@@ -672,15 +672,11 @@ protected:
 private:	
 	static S32 sNumObjects;
 
-	//--------------------------------------------------------------------
-	// For objects that are attachments
-	//--------------------------------------------------------------------
 public:
-	const LLUUID &getAttachmentItemID() const;
-	void setAttachmentItemID(const LLUUID &id);
-	const LLUUID &extractAttachmentItemID(); // find&set the inventory item ID of the attached object
+	const LLUUID &getItemID() const { return mAttachmentItemID; }
+	void setItemID(const LLUUID &id) { mAttachmentItemID = id; }
 private:
-	LLUUID mAttachmentItemID; // ItemID of the associated object is in user inventory.
+	LLUUID mAttachmentItemID; // ItemID when item is in user inventory.
 };
 
 ///////////////////