merge -r 56779:58057 /branches/selection_management

1 files changed, 10 insertions, 1 deletions

diff --git a/indra/newview/llfloatertools.h b/indra/newview/llfloatertools.h
index e13e15ba01..7c85444578 100644
--- a/indra/newview/llfloatertools.h
+++ b/indra/newview/llfloatertools.h
@@ -25,6 +25,11 @@ class LLPanelFace;
 class LLPanelLandInfo;
 class LLComboBox;
 class LLVolumeSliderCtrl;
+class LLParcelSelection;
+class LLObjectSelection;
+
+typedef LLHandle<LLParcelSelection> LLParcelSelectionHandle;
+typedef LLHandle<LLObjectSelection> LLObjectSelectionHandle;
 
 class LLFloaterTools
 : public LLFloater
@@ -42,6 +47,7 @@ public:
 	LLFloaterTools();
 	virtual ~LLFloaterTools();
 
+	virtual void onOpen();
 	virtual void onClose(bool app_quitting);
 	virtual BOOL canClose();
 
@@ -156,7 +162,10 @@ public:
 	LLPanelLandInfo			*mPanelLandInfo;
 
 	LLTabContainer*			mTabLand;
-	
+
+	LLParcelSelectionHandle	mParcelSelection;
+	LLObjectSelectionHandle	mObjectSelection;
+
 private:
 	BOOL					mDirty;
 	S32						mSmallHeight;