merge -r 56779:58057 /branches/selection_management

1 files changed, 11 insertions, 2 deletions

diff --git a/indra/newview/llviewermenu.h b/indra/newview/llviewermenu.h
index 182190ccdf..f2d7e360c7 100644
--- a/indra/newview/llviewermenu.h
+++ b/indra/newview/llviewermenu.h
@@ -18,6 +18,8 @@
 
 class LLUICtrl;
 class LLView;
+class LLParcelSelection;
+class LLObjectSelection;
 
 struct LLResourceData
 {
@@ -126,11 +128,18 @@ class LLPermissions;
 class LLViewerMenuHolderGL : public LLMenuHolderGL
 {
 public:
-	LLViewerMenuHolderGL() : LLMenuHolderGL() {};
+	LLViewerMenuHolderGL();
 
 	virtual BOOL hideMenus();
+	
+	void setParcelSelection(LLHandle<LLParcelSelection> selection);
+	void setObjectSelection(LLHandle<LLObjectSelection> selection);
+
 	virtual const LLRect getMenuRect() const;
-	//virtual BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent);
+
+protected:
+	LLHandle<LLParcelSelection> mParcelSelection;
+	LLHandle<LLObjectSelection> mObjectSelection;
 };
 
 extern const LLString SAVE_INTO_INVENTORY;