From d35ef7e5d8f3968479543819501bd201e6321355 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Tue, 27 Jun 2023 20:20:56 +0300 Subject: [PATCH 1/2] SL-19924 Update profile type names --- indra/newview/llpanelprofile.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp index 34e1fd09d8..8ac1efe8e7 100644 --- a/indra/newview/llpanelprofile.cpp +++ b/indra/newview/llpanelprofile.cpp @@ -1295,14 +1295,14 @@ void LLPanelProfileSecondLife::fillAccountStatus(const LLAvatarData* avatar_data childSetVisible("badge_layout", TRUE); childSetVisible("partner_spacer_layout", FALSE); } - else if (customer_lower == "premium_lifetime") + else if (customer_lower == "secondlifetime_premium") { - getChild("badge_icon")->setValue("Profile_Premium_Lifetime"); + getChild("badge_icon")->setValue("Profile_Badge_Premium_Lifetime"); getChild("badge_text")->setValue(getString("BadgePremiumLifetime")); childSetVisible("badge_layout", TRUE); childSetVisible("partner_spacer_layout", FALSE); } - else if (customer_lower == "pplus_lifetime" || customer_lower == "premium_plus_lifetime") + else if (customer_lower == "secondlifetime_premium_plus") { getChild("badge_icon")->setValue("Profile_Badge_Pplus_Lifetime"); getChild("badge_text")->setValue(getString("BadgePremiumPlusLifetime")); From ed63ef3c0b6ceddf9ed667c1d69441d132b34983 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Wed, 28 Jun 2023 00:34:15 +0300 Subject: [PATCH 2/2] SL-19572 Fix some obscure cases of residents bypasing mute list --- indra/llmessage/llcachename.cpp | 4 +++- indra/newview/llmutelist.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/indra/llmessage/llcachename.cpp b/indra/llmessage/llcachename.cpp index 66bd85f4e6..a2e85cf6c2 100644 --- a/indra/llmessage/llcachename.cpp +++ b/indra/llmessage/llcachename.cpp @@ -552,7 +552,9 @@ std::string LLCacheName::buildUsername(const std::string& full_name) // if the input wasn't a correctly formatted legacy name, just return it // cleaned up from a potential terminal "Resident" - return cleanFullName(full_name); + std::string clean_name = cleanFullName(full_name); + LLStringUtil::toLower(clean_name); + return clean_name; } //static diff --git a/indra/newview/llmutelist.h b/indra/newview/llmutelist.h index 2c45014321..14840f1b2e 100644 --- a/indra/newview/llmutelist.h +++ b/indra/newview/llmutelist.h @@ -99,6 +99,7 @@ public: BOOL isMuted(const LLUUID& id, const std::string& name = LLStringUtil::null, U32 flags = 0) const; // Workaround for username-based mute search, a lot of string conversions so use cautiously + // Expects lower case username BOOL isMuted(const std::string& username, U32 flags = 0) const; // Alternate (convenience) form for places we don't need to pass the name, but do need flags