From e1d8dac25a93db837c780428a23f81cbf9109270 Mon Sep 17 00:00:00 2001
From: Melinda Green <melinda@lindenlab.com>
Date: Mon, 15 Dec 2008 21:21:19 +0000
Subject: svn merge -r105329:105903
 svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge
 Resolving QAR-1051 Merge featurettes batch #4

---
 indra/newview/llnetmap.h | 6 ++++++
 1 file changed, 6 insertions(+)

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

diff --git a/indra/newview/llnetmap.h b/indra/newview/llnetmap.h
index 3950a08166..214dc4df93 100644
--- a/indra/newview/llnetmap.h
+++ b/indra/newview/llnetmap.h
@@ -108,8 +108,14 @@ public:
 	LLTextBox*		mTextBoxNorthWest;
 	LLTextBox*		mTextBoxSouthWest;
 
+private:
+	LLUUID			mClosestAgentToCursor;
+	LLUUID			mClosestAgentAtLastRightClick;
+
 	static BOOL		sRotateMap;
 	static LLNetMap*	sInstance;
+	static BOOL isAgentUnderCursor(void*) { return sInstance && sInstance->mClosestAgentToCursor.notNull(); }
+	static void showAgentProfile(void*);
 };
 
 
-- 
cgit v1.2.3