diff options
Diffstat (limited to 'linden/indra/newview/llworldmapview.cpp')
-rw-r--r-- | linden/indra/newview/llworldmapview.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/linden/indra/newview/llworldmapview.cpp b/linden/indra/newview/llworldmapview.cpp index e12bd08..443ee74 100644 --- a/linden/indra/newview/llworldmapview.cpp +++ b/linden/indra/newview/llworldmapview.cpp | |||
@@ -64,6 +64,9 @@ | |||
64 | #include "lltexturefetch.h" | 64 | #include "lltexturefetch.h" |
65 | #include "llappviewer.h" // Only for constants! | 65 | #include "llappviewer.h" // Only for constants! |
66 | #include "lltrans.h" | 66 | #include "lltrans.h" |
67 | // [RLVa:KB] | ||
68 | #include "rlvhandler.h" | ||
69 | // [/RLVa:KB] | ||
67 | 70 | ||
68 | #include "llglheaders.h" | 71 | #include "llglheaders.h" |
69 | 72 | ||
@@ -696,7 +699,7 @@ void LLWorldMapView::draw() | |||
696 | // [RLVa:KB] - Alternate: Snowglobe-1.0 | Checked: 2009-07-04 (RLVa-1.0.0a) | 699 | // [RLVa:KB] - Alternate: Snowglobe-1.0 | Checked: 2009-07-04 (RLVa-1.0.0a) |
697 | if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) | 700 | if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) |
698 | { | 701 | { |
699 | mesg = rlv_handler_t::cstrHidden; | 702 | mesg = RlvStrings::getString(RLV_STRING_HIDDEN); |
700 | } | 703 | } |
701 | else if (info->mAccess == SIM_ACCESS_DOWN) | 704 | else if (info->mAccess == SIM_ACCESS_DOWN) |
702 | // [/RLVa:KB] | 705 | // [/RLVa:KB] |
@@ -1285,7 +1288,7 @@ BOOL LLWorldMapView::handleToolTip( S32 x, S32 y, std::string& msg, LLRect* stic | |||
1285 | // [RLVa:KB] - Alternate: Snowglobe-1.0 | Checked: 2009-07-04 (RLVa-1.0.0a) | 1288 | // [RLVa:KB] - Alternate: Snowglobe-1.0 | Checked: 2009-07-04 (RLVa-1.0.0a) |
1286 | std::string message = | 1289 | std::string message = |
1287 | llformat("%s (%s)", | 1290 | llformat("%s (%s)", |
1288 | (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) ? info->mName.c_str() : rlv_handler_t::cstrHidden.c_str(), | 1291 | (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) ? info->mName.c_str() : RlvStrings::getString(RLV_STRING_HIDDEN).c_str(), |
1289 | LLViewerRegion::accessToString(info->mAccess).c_str()); | 1292 | LLViewerRegion::accessToString(info->mAccess).c_str()); |
1290 | // [/RLVa:KB] | 1293 | // [/RLVa:KB] |
1291 | 1294 | ||