From 227cfe37c9dd09494fecdfdd01dcd11d42a47d94 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Mon, 17 Jan 2022 13:16:30 +0100 Subject: [PATCH] Don't half-way apply RLVa name filter to names in online/offline status notifications --- indra/newview/llcallingcard.cpp | 1 + indra/newview/llfloaterimnearbychathandler.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/indra/newview/llcallingcard.cpp b/indra/newview/llcallingcard.cpp index 753a78fefd..e55931cfa9 100644 --- a/indra/newview/llcallingcard.cpp +++ b/indra/newview/llcallingcard.cpp @@ -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); } diff --git a/indra/newview/llfloaterimnearbychathandler.cpp b/indra/newview/llfloaterimnearbychathandler.cpp index 3136f96fe4..2031fc6a4e 100644 --- a/indra/newview/llfloaterimnearbychathandler.cpp +++ b/indra/newview/llfloaterimnearbychathandler.cpp @@ -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;