From 276fc94aed832b13a17e13b57641a22d705e4e38 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Wed, 16 Sep 2009 00:13:59 -0700
Subject: Fixed bad RLVa behavior in minimap

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

(limited to 'linden')

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 ); 
-- 
cgit v1.1