2 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 7653e53..f3eb892 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -32,6 +32,11 @@
                 modified:   linden/indra/newview/llfloatermap.cpp
                 modified:   linden/indra/newview/llfloatermap.h
                 modified:   linden/indra/newview/llnetmap.cpp
+                
+                
+     * Fixed bad RLVa behavior in minimap.
+         
+                modified:   linden/indra/newview/llnetmap.cpp
 
 
 2009-09-14 McCabe Maxsted  <hakushakukun@gmail.com>
diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp
index 1f6f6bd..c1a25f9 100644
--- a/linden/indra/newview/llnetmap.cpp
+++ b/linden/indra/newview/llnetmap.cpp
@@ -367,7 +367,7 @@ void LLNetMap::draw()
                         }
 
 // [RLVa:KB]
-                        if ( !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES) )
+                        if ( rlv_handler_t::isEnabled() && !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.
@@ -575,7 +575,7 @@ BOOL LLNetMap::handleToolTip( S32 x, S32 y, std::string& msg, LLRect* sticky_rec
                 if(mClosestAgentToCursor.notNull() && gCacheName->getFullName(mClosestAgentToCursor, fullname))
                 {
 // [RLVa:KB]
-                        if ( !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES) )
+                        if ( rlv_handler_t::isEnabled() && !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES) )
                         {
                                 // User is not allowed to see who it is, due to RLV settings.
                                 msg.append(rlv_handler_t::cstrHidden);
@@ -589,7 +589,7 @@ BOOL LLNetMap::handleToolTip( S32 x, S32 y, std::string& msg, LLRect* sticky_rec
                 }
                 
 // [RLVa:KB]
-                if (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
+                if (rlv_handler_t::isEnabled() && !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
                 {
                         // User is not allowed to see where they are, due to RLV settings.
                         msg.append( rlv_handler_t::cstrHidden );