livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't half-way apply RLVa name filter to names in online/offline status notifications

meow-7.2.2
Ansariel 2022-01-17 13:16:30 +01:00
parent d031507caa
commit 227cfe37c9
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/llcallingcard.cpp
View File

@ -885,6 +885,7 @@ static void on_avatar_name_cache_notify(const LLUUID& agent_id,
}
else
{
args["ONLINE_STATUS"] = true;
LLNotificationsUI::LLNotificationManager::instance().onChat(chat, args);
}

2
indra/newview/llfloaterimnearbychathandler.cpp
View File

@ -569,7 +569,7 @@ void LLFloaterIMNearbyChatHandler::processChat(const LLChat& chat_msg,
RlvUtil::filterLocation(tmp_chat.mText);
tmp_chat.mRlvLocFiltered = TRUE;
}
if ( (!RlvActions::canShowName(RlvActions::SNC_DEFAULT)) && (!tmp_chat.mRlvNamesFiltered) && (CHAT_SOURCE_AGENT != tmp_chat.mSourceType) )
if ( (!RlvActions::canShowName(RlvActions::SNC_DEFAULT)) && (!tmp_chat.mRlvNamesFiltered) && (CHAT_SOURCE_AGENT != tmp_chat.mSourceType) && (!args.has("ONLINE_STATUS") || !args["ONLINE_STATUS"].asBoolean()) )
{
RlvUtil::filterNames(tmp_chat.mText);
tmp_chat.mRlvNamesFiltered = TRUE;