From d1582a5105f01181535fb859c530e45c2efca071 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Mon, 5 Feb 2007 20:20:42 +0000
Subject: merge -r 57111:57464 maintenance.

---
 indra/newview/llnetmap.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp
index 26f4a2fb5b..b03996d460 100644
--- a/indra/newview/llnetmap.cpp
+++ b/indra/newview/llnetmap.cpp
@@ -772,7 +772,7 @@ BOOL LLNetMap::handleRightMouseDown(S32 x, S32 y, MASK mask)
 	if (menu)
 	{
 		menu->buildDrawLabels();
-		menu->updateParent(gMenuHolder);
+		menu->updateParent(LLMenuGL::sMenuContainer);
 		LLMenuGL::showPopup(this, menu, x, y);
 	}
 	return TRUE;
-- 
cgit v1.2.3