From 861d77064048b0001e562847c8cf9adaac56cb57 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sun, 27 Sep 2009 17:06:50 -0700
Subject: Fixed bad merge in llnetmap.cpp

---
 linden/indra/newview/llnetmap.cpp | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'linden/indra')

diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp
index e848aeb..f055dbc 100644
--- a/linden/indra/newview/llnetmap.cpp
+++ b/linden/indra/newview/llnetmap.cpp
@@ -388,16 +388,6 @@ void LLNetMap::draw()
 			}
 // [/RLVa:KB]
 
-// [RLVa:KB]
-			if ( !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES) )
-			{
-				// User is not allowed to see who it is, or even if it's a friend,
-				// due to RLV settings.
-				glyph_color = avatar_color;
-			}
-// [/RLVa:KB]
-
-
 			LLWorldMapView::drawAvatar(
 				pos_map.mV[VX], pos_map.mV[VY], 
 				glyph_color, 
-- 
cgit v1.1