From 0ef8e99a361d253b2709cf8fc4717e65aa54485f Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Tue, 22 Sep 2009 21:03:08 -0700 Subject: Fixed RLVa issue in LLNetMap the right way (thanks Kitty) --- ChangeLog.txt | 7 +++++++ linden/indra/newview/llnetmap.cpp | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index db9de23..7e07eee 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,10 @@ +2009-09-22 McCabe Maxsted + + * Fixed RLVa issue in LLNetMap the right way (thanks Kitty). + + modified: linden/indra/newview/llnetmap.cpp + + 2009-09-21 McCabe Maxsted * Changed 'Presets' button to 'Sky'. diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp index cac35b9..97272f4 100644 --- a/linden/indra/newview/llnetmap.cpp +++ b/linden/indra/newview/llnetmap.cpp @@ -380,7 +380,7 @@ void LLNetMap::draw() } // [RLVa:KB] - if ( rlv_handler_t::isEnabled() && !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES) ) + 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. @@ -595,7 +595,7 @@ BOOL LLNetMap::handleToolTip( S32 x, S32 y, std::string& msg, LLRect* sticky_rec if(mClosestAgentToCursor.notNull() && gCacheName->getFullName(mClosestAgentToCursor, fullname)) { // [RLVa:KB] - if ( rlv_handler_t::isEnabled() && !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES) ) + if ( gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES) ) { // User is not allowed to see who it is, due to RLV settings. msg.append(rlv_handler_t::cstrHidden); @@ -609,7 +609,7 @@ BOOL LLNetMap::handleToolTip( S32 x, S32 y, std::string& msg, LLRect* sticky_rec } // [RLVa:KB] - if (rlv_handler_t::isEnabled() && !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) + if ( 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