Merge

1 files changed, 5 insertions, 0 deletions

diff --git a/indra/newview/llsidepaneliteminfo.h b/indra/newview/llsidepaneliteminfo.h
index e6dbf400ee..624c7273e0 100644
--- a/indra/newview/llsidepaneliteminfo.h
+++ b/indra/newview/llsidepaneliteminfo.h
@@ -43,6 +43,7 @@
 class LLButton;
 class LLViewerInventoryItem;
 class LLItemPropertiesObserver;
+class LLObjectInventoryObserver;
 class LLViewerObject;
 class LLPermissions;
 
@@ -69,9 +70,13 @@ protected:
 	void refreshFromItem(LLViewerInventoryItem* item);
 
 private:
+	void startObjectInventoryObserver();
+	void stopObjectInventoryObserver();
+
 	LLUUID mItemID; 	// inventory UUID for the inventory item.
 	LLUUID mObjectID; 	// in-world task UUID, or null if in agent inventory.
 	LLItemPropertiesObserver* mPropertiesObserver; // for syncing changes to item
+	LLObjectInventoryObserver* mObjectInventoryObserver; // for syncing changes to items inside an object
 	
 	//
 	// UI Elements