From 305c74d5163c5e344a675d39ca2394a9e45bd2c2 Mon Sep 17 00:00:00 2001
From: Aaron Brashears <aaronb@lindenlab.com>
Date: Fri, 2 Feb 2007 17:28:58 +0000
Subject: Result of svn merge -r57264:57370
 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.

---
 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 6be8bc8c78..26f4a2fb5b 100644
--- a/indra/newview/llnetmap.cpp
+++ b/indra/newview/llnetmap.cpp
@@ -590,7 +590,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);
-- 
cgit v1.2.3