merge -r 56779:58057 /branches/selection_management

1 files changed, 4 insertions, 3 deletions

diff --git a/indra/newview/llfloateropenobject.h b/indra/newview/llfloateropenobject.h
index 8de8832ca9..88635d58b1 100644
--- a/indra/newview/llfloateropenobject.h
+++ b/indra/newview/llfloateropenobject.h
@@ -16,8 +16,7 @@
 
 #include "llfloater.h"
 
-
-
+class LLObjectSelection;
 class LLPanelInventory;
 
 class LLFloaterOpenObject
@@ -40,9 +39,10 @@ protected:
 	void refresh();
 	void draw();
 
+	void moveToInventory(bool wear);
+
 	static void onClickMoveToInventory(void* data);
 	static void onClickMoveAndWear(void* data);
-	static void moveToInventory(bool wear);
 	static void callbackMoveInventory(S32 result, void* data);
 	static void* createPanelInventory(void* data);
 
@@ -50,6 +50,7 @@ protected:
 	static LLFloaterOpenObject* sInstance;
 
 	LLPanelInventory*	mPanelInventory;
+	LLHandle<LLObjectSelection> mObjectSelection;
 	BOOL mDirty;
 };