From bde7d67066d189416a725da4527a02eb4f78ba4a Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Mon, 2 Nov 2009 15:39:55 -0500
Subject: EXT-1866 : Inventory Side Panel svn merge -r137106:137808
 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/inventory-panel

Porting over changes from svn Inventory Panel work.
---
 indra/newview/llfloateropenobject.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/llfloateropenobject.h')

diff --git a/indra/newview/llfloateropenobject.h b/indra/newview/llfloateropenobject.h
index a61cc04941..10d96b7ea3 100644
--- a/indra/newview/llfloateropenobject.h
+++ b/indra/newview/llfloateropenobject.h
@@ -41,7 +41,7 @@
 #include "llfloater.h"
 
 class LLObjectSelection;
-class LLPanelInventory;
+class LLPanelObjectInventory;
 
 class LLFloaterOpenObject
 : public LLFloater
@@ -77,7 +77,7 @@ private:
 	
 protected:
 
-	LLPanelInventory*	mPanelInventory;
+	LLPanelObjectInventory*	mPanelInventoryObject;
 	LLSafeHandle<LLObjectSelection> mObjectSelection;
 	BOOL mDirty;
 };
-- 
cgit v1.2.3