Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge llnameui changes from future branch to use lighter rlv headers

Browse Source
This commit is contained in:
Liru Færs
2019-11-07 13:55:07 -05:00
parent 4e39027958
commit b78807e5ed
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llnameui.cpp
View File

@@ -40,7 +40,8 @@
#include "llgroupactions.h" #include "llgroupactions.h"
#include "lltrans.h" #include "lltrans.h"
#include "rlvhandler.h" #include "rlvactions.h"
#include "rlvcommon.h"
// statics // statics
std::set<LLNameUI*> LLNameUI::sInstances; std::set<LLNameUI*> LLNameUI::sInstances;
@@ -97,7 +98,7 @@ void LLNameUI::setNameText()
if (!mIsGroup && got_name && mRLVSensitive) // Filter if needed 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)) && mNameID != gAgentID && RlvUtil::isNearbyAgent(mNameID))
{ {
mAllowInteract = false; mAllowInteract = false;