2 files changed, 5 insertions, 10 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 07e551a..541e740 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,10 @@
 2009-09-27 McCabe Maxsted  <hakushakukun@gmail.com>
 
+        * Fixed bad merge in llnetmap.cpp.
+        
+          modified:   linden/indra/newview/llnetmap.cpp
+          
+          
         * Fixed JPEG quality slider displaying over high-res checkbox in snapshot floater (IMP-140).
         
           modified:   linden/indra/newview/llfloatersnapshot.cpp
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,