From 73caee4208a4e05f66583de099502012fd8415ea Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Fri, 14 Aug 2009 21:50:02 +0000
Subject: svn merge
 https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1331
 https://svn.aws.productengine.com/secondlife/pe/stable-1@1340 ->
 viewer-2.0.0-3 EXT-269 EXT-274 EXT-276 EXT-277 EXT-282 EXT-296 EXT-342
 EXT-370 EXT-379 EXT-394 EXT-398 EXT-405 EXT-407 EXT-410 EXT-413 EXT-414
 EXT-450 EXT-456 EXT-477 EXT-482 EXT-496

---
 indra/newview/lllocationinputctrl.h | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/lllocationinputctrl.h b/indra/newview/lllocationinputctrl.h
index 0196aae4e7..1b26a07d83 100644
--- a/indra/newview/lllocationinputctrl.h
+++ b/indra/newview/lllocationinputctrl.h
@@ -40,6 +40,7 @@ class LLLandmark;
 // internals
 class LLAddLandmarkObserver;
 class LLRemoveLandmarkObserver;
+class LLMenuGL;
 
 /**
  * Location input control.
@@ -98,16 +99,22 @@ private:
 	void					rebuildLocationHistory(std::string filter = "");
 	void					setText(const LLStringExplicit& text);
 	void					updateAddLandmarkButton();
+	void 					updateContextMenu();
 	void					updateWidgetlayout();
+	void					changeLocationPresentation();
 
 	void					onInfoButtonClicked();
 	void					onLocationHistoryLoaded();
 	void					onLocationPrearrange(const LLSD& data);
-	void 					onTextEditorMouseUp(S32 x, S32 y, MASK mask);
+	void 					onTextEditorRightClicked(S32 x, S32 y, MASK mask);
 	void					onLandmarkLoaded(LLLandmark* lm);
 	void					onAddLandmarkButtonClicked();
 	void					onAgentParcelChange();
+	// callbacks
+	bool					onLocationContextMenuItemEnabled(const LLSD& userdata);
+	void 					onLocationContextMenuItemClicked(const LLSD& userdata);
 
+	LLMenuGL*				mLocationContextMenu;
 	LLButton*				mAddLandmarkBtn;
 	LLButton*				mInfoBtn;
 	S32						mAddLandmarkHPad;
-- 
cgit v1.2.3