From 89fe5dab825a62a0e3fd8d248cbc91c65eb2a426 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 15 Aug 2008 23:44:50 -0500
Subject: Second Life viewer sources 1.14.0.0

---
 linden/indra/newview/llnetmap.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp
index 3db447a..dcbf960 100644
--- a/linden/indra/newview/llnetmap.cpp
+++ b/linden/indra/newview/llnetmap.cpp
@@ -609,7 +609,7 @@ BOOL LLNetMap::handleToolTip( S32 x, S32 y, LLString& msg, LLRect* sticky_rect_s
 			msg.assign( region->getName() );
 
 #ifndef LL_RELEASE_FOR_DOWNLOAD
-			char buffer[MAX_STRING];
+			char buffer[MAX_STRING];		/*Flawfinder: ignore*/
 			msg.append("\n");
 			region->getHost().getHostName(buffer, MAX_STRING);
 			msg.append(buffer);
@@ -791,7 +791,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.1