aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llworldmapview.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-08-19 10:54:12 -0700
committerMcCabe Maxsted2010-08-26 11:22:52 -0700
commitfee791f808c6adcb114302f39aacce4d5834edf5 (patch)
tree8328ae00e6af4163f68adfaf12e0947e91b84135 /linden/indra/newview/llworldmapview.cpp
parentDisable ParticleChat by default, as it's a privacy concern. (diff)
downloadmeta-impy-fee791f808c6adcb114302f39aacce4d5834edf5.zip
meta-impy-fee791f808c6adcb114302f39aacce4d5834edf5.tar.gz
meta-impy-fee791f808c6adcb114302f39aacce4d5834edf5.tar.bz2
meta-impy-fee791f808c6adcb114302f39aacce4d5834edf5.tar.xz
Applied RLVa-1.0.5e_fix.patch by Kitty Barnett to fix RLVa up to 1.0.5.e
Diffstat (limited to 'linden/indra/newview/llworldmapview.cpp')
-rw-r--r--linden/indra/newview/llworldmapview.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/linden/indra/newview/llworldmapview.cpp b/linden/indra/newview/llworldmapview.cpp
index c10faa5..2e28d18 100644
--- a/linden/indra/newview/llworldmapview.cpp
+++ b/linden/indra/newview/llworldmapview.cpp
@@ -1246,13 +1246,16 @@ BOOL LLWorldMapView::handleToolTip( S32 x, S32 y, std::string& msg, LLRect* stic
1246 { 1246 {
1247 LLViewerRegion *region = gAgent.getRegion(); 1247 LLViewerRegion *region = gAgent.getRegion();
1248 1248
1249// std::string message =
1250// llformat("%s (%s)",
1251// info->mName.c_str(),
1252// LLViewerRegion::accessToString(info->mAccess).c_str());
1253// [RLVa:KB] - Alternate: Snowglobe-1.0 | Checked: 2009-07-04 (RLVa-1.0.0a)
1249 std::string message = 1254 std::string message =
1250 llformat("%s (%s)", 1255 llformat("%s (%s)",
1251 //info->mName.c_str(), 1256 (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) ? info->mName.c_str() : rlv_handler_t::cstrHidden.c_str(),
1252// [RLVa:KB] - Alternate: Snowglobe-1.0 | Checked: 2009-07-04 (RLVa-1.0.0a)
1253 (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) ? info->mName.c_str() : rlv_handler_t::cstrHidden.c_str(),
1254// [/RLVa:KB]
1255 LLViewerRegion::accessToString(info->mAccess).c_str()); 1257 LLViewerRegion::accessToString(info->mAccess).c_str());
1258// [/RLVa:KB]
1256 1259
1257 if (info->mAccess != SIM_ACCESS_DOWN) 1260 if (info->mAccess != SIM_ACCESS_DOWN)
1258 { 1261 {