Merged in jacek/next

1 files changed, 16 insertions, 3 deletions

diff --git a/linden/indra/newview/llworldmapview.cpp b/linden/indra/newview/llworldmapview.cpp
index 77833c3..5e51e6f 100644
--- a/linden/indra/newview/llworldmapview.cpp
+++ b/linden/indra/newview/llworldmapview.cpp
@@ -640,7 +640,14 @@ void LLWorldMapView::draw()
                         //                      info->mAgents,
                         //                      info->mName.c_str(),
                         //                      LLViewerRegion::accessToShortString(info->mAccess).c_str() );
-                        if (info->mAccess == SIM_ACCESS_DOWN)
+// [RLVa:KB] - Alternate: Snowglobe-1.0 | Checked: 2009-07-04 (RLVa-1.0.0a)
+                        if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
+                        {
+                                mesg = rlv_handler_t::cstrHidden;
+                        }
+                        else if (info->mAccess == SIM_ACCESS_DOWN)
+// [/RLVa:KB]
+//                      if (info->mAccess == SIM_ACCESS_DOWN)
                         {
                                 mesg = llformat( "%s (%s)", info->mName.c_str(), sStringsMap["offline"].c_str());
                         }
@@ -1069,7 +1076,10 @@ void LLWorldMapView::drawTracking(const LLVector3d& pos_global, const LLColor4&
         text_x = llclamp(text_x, half_text_width + TEXT_PADDING, getRect().getWidth() - half_text_width - TEXT_PADDING);
         text_y = llclamp(text_y + vert_offset, TEXT_PADDING + vert_offset, getRect().getHeight() - llround(font->getLineHeight()) - TEXT_PADDING - vert_offset);
 
-        if (label != "")
+        //if (label != "")
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a) | Added: RLVa-1.0.0a
+        if ( (label != "") && (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) )
+// [/RLVa:KB]
         {
                 font->renderUTF8(
                         label, 0,
@@ -1129,7 +1139,10 @@ BOOL LLWorldMapView::handleToolTip( S32 x, S32 y, std::string& msg, LLRect* stic
 
                 std::string message = 
                         llformat("%s (%s)",
-                                         info->mName.c_str(),
+                                         //info->mName.c_str(),
+// [RLVa:KB] - Alternate: Snowglobe-1.0 | Checked: 2009-07-04 (RLVa-1.0.0a)
+                                         (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) ? info->mName.c_str() : rlv_handler_t::cstrHidden.c_str(),
+// [/RLVa:KB]
                                          LLViewerRegion::accessToString(info->mAccess).c_str());
 
                 if (info->mAccess != SIM_ACCESS_DOWN)