From 8cc2499f0a33887d542fed25ebf4dc23a5b7a8e8 Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Thu, 19 Mar 2015 00:04:12 -0400 Subject: [PATCH] [RLVa] Respect @showloc in IFF --- indra/newview/lltoolgun.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indra/newview/lltoolgun.cpp b/indra/newview/lltoolgun.cpp index 09112d284..633860860 100644 --- a/indra/newview/lltoolgun.cpp +++ b/indra/newview/lltoolgun.cpp @@ -189,9 +189,10 @@ void LLToolGun::draw() LLAvatarNameCache::get(id, &avatarName); bool name_restricted = gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES); getCustomColorRLV(id, targetColor, world.getRegionFromPosGlobal(targetPosition), name_restricted); + const std::string name(name_restricted ? RlvStrings::getAnonym(avatarName) : avatarName.getNSName()); targetColor.mV[VALPHA] = 0.5f; LLFontGL::getFontSansSerifBold()->renderUTF8( - llformat("%s : %.2fm", name_restricted ? RlvStrings::getAnonym(avatarName).c_str() : avatarName.getNSName().c_str(), (targetPosition - myPosition).magVec()), + gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC) ? name : llformat("%s : %.2fm", name.c_str(), (targetPosition - myPosition).magVec()), 0, (windowWidth / 2.f), (windowHeight / 2.f) - 25.f, targetColor, LLFontGL::HCENTER, LLFontGL::TOP, LLFontGL::BOLD, LLFontGL::NO_SHADOW );