From b78807e5ed4e2bfff4c04076a28845addc354ee7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Liru=20F=C3=A6rs?= Date: Thu, 7 Nov 2019 13:55:07 -0500 Subject: [PATCH] Merge llnameui changes from future branch to use lighter rlv headers --- indra/newview/llnameui.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/indra/newview/llnameui.cpp b/indra/newview/llnameui.cpp index 3c3a50a14..bd31a11da 100644 --- a/indra/newview/llnameui.cpp +++ b/indra/newview/llnameui.cpp @@ -40,7 +40,8 @@ #include "llgroupactions.h" #include "lltrans.h" -#include "rlvhandler.h" +#include "rlvactions.h" +#include "rlvcommon.h" // statics std::set LLNameUI::sInstances; @@ -97,7 +98,7 @@ void LLNameUI::setNameText() if (!mIsGroup && got_name && mRLVSensitive) // Filter if needed { - if ((gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES) || gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMETAGS)) + if ((RlvActions::hasBehaviour(RLV_BHVR_SHOWNAMES) || RlvActions::hasBehaviour(RLV_BHVR_SHOWNAMETAGS)) && mNameID != gAgentID && RlvUtil::isNearbyAgent(mNameID)) { mAllowInteract = false;