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

Merge branch 'DRTVWR-580-maint-T' of https://github.com/secondlife/viewer 

# Conflicts:
#	indra/newview/llpanelprofile.cpp
master
Ansariel 2023-06-28 14:16:31 +02:00
parent b0e9ce8dc4 ed63ef3c0b
commit 70149fa44f
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llmessage/llcachename.cpp
View File

@ -606,7 +606,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

1
indra/newview/llmutelist.h
View File

@ -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

8
indra/newview/llpanelprofile.cpp
View File

@ -1624,16 +1624,16 @@ void LLPanelProfileSecondLife::fillAccountStatus(const LLAvatarData* avatar_data
//childSetVisible("partner_spacer_layout", FALSE);
setBadge("Profile_Badge_Lifetime", "BadgeLifetime");
}
else if (customer_lower == "premium_lifetime")
else if (customer_lower == "secondlifetime_premium")
{
// <FS:Ansariel> Fix LL UI/UX design accident
//getChild<LLUICtrl>("badge_icon")->setValue("Profile_Premium_Lifetime");
//getChild<LLUICtrl>("badge_icon")->setValue("Profile_Badge_Premium_Lifetime");
//getChild<LLUICtrl>("badge_text")->setValue(getString("BadgePremiumLifetime"));
//childSetVisible("badge_layout", TRUE);
//childSetVisible("partner_spacer_layout", FALSE);
setBadge("Profile_Premium_Lifetime", "BadgePremiumLifetime");
setBadge("Profile_Badge_Premium_Lifetime", "BadgePremiumLifetime");
}
else if (customer_lower == "pplus_lifetime" || customer_lower == "premium_plus_lifetime")
else if (customer_lower == "secondlifetime_premium_plus")
{
// <FS:Ansariel> Fix LL UI/UX design accident
//getChild<LLUICtrl>("badge_icon")->setValue("Profile_Badge_Pplus_Lifetime");