Merge remote branch 'mccabe/1.2.0-next' into next

1 files changed, 20 insertions, 17 deletions

diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp
index 9ef56c1..e848aeb 100644
--- a/linden/indra/newview/llnetmap.cpp
+++ b/linden/indra/newview/llnetmap.cpp
@@ -379,8 +379,8 @@ void LLNetMap::draw()
                                 }
                         }
 
-// [RLVa:KB]
-                        if ( rlv_handler_t::isEnabled() && !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES) )
+// [RLVa:KB] - Alternate: Imprudence-1.2.0
+                        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.
@@ -604,22 +604,15 @@ BOOL LLNetMap::handleToolTip( S32 x, S32 y, std::string& msg, LLRect* sticky_rec
                 std::string fullname;
                 if(mClosestAgentToCursor.notNull() && gCacheName->getFullName(mClosestAgentToCursor, fullname))
                 {
-// [RLVa:KB]
-                        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);
-                        }
-                        else
-                        {
-                                msg.append(fullname);
-                                msg.append("\n");
-                        }
-// [/RLVa:KB]
+// [RLVa:KB] - Alternate: Imprudence-1.2.0
+                        // User is not allowed to see who it is, due to RLV settings.
+                        msg.append( (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) ? fullname : gRlvHandler.getAnonym(fullname) );
+                        msg.append("\n");
+ // [/RLVa:KB]
                 }
                 
-// [RLVa:KB]
-                if (rlv_handler_t::isEnabled() && !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
+// [RLVa:KB] - Alternate: Imprudence-1.2.0
+                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 ); 
@@ -1028,6 +1021,13 @@ bool LLNetMap::LLEnableTracking::handleEvent(LLPointer<LLEvent> event, const LLS
 
 bool LLNetMap::LLShowAgentProfile::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 {
+// [RLVa:KB] - Alternate: Imprudence-1.2.0
+        if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+        {
+                return true;
+        }
+// [/RLVa:KB]
+
         LLNetMap *self = mPtr;
         LLFloaterAvatarInfo::show(self->mClosestAgentAtLastRightClick);
         return true;
@@ -1036,6 +1036,9 @@ bool LLNetMap::LLShowAgentProfile::handleEvent(LLPointer<LLEvent> event, const L
 bool LLNetMap::LLEnableProfile::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 {
         LLNetMap *self = mPtr;
-        self->findControl(userdata["control"].asString())->setValue(self->isAgentUnderCursor());
+        //self->findControl(userdata["control"].asString())->setValue(self->isAgentUnderCursor());
+// [RLVa:KB] - Alternate: Imprudence-1.2.0
+        self->findControl(userdata["control"].asString())->setValue(self->isAgentUnderCursor() && !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES));
+// [/RLVa:KB]
         return true;
 }