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

Manually apply [PATCH] SL-17356 Viewer changes for Premium Plus support

master
Ansariel 2022-05-27 13:06:07 +02:00
parent 3e14f539c6
commit 69f60f59a2
9 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llpanelgroupcreate.cpp
View File

@ -109,7 +109,7 @@ void LLPanelGroupCreate::onOpen(const LLSD& key)
// populate list
addMembershipRow("Base");
addMembershipRow("Premium");
addMembershipRow("Premium Plus");
addMembershipRow("Premium_Plus");
addMembershipRow("Internal");// Present only if you are already in one, needed for testing
S32 cost = LLAgentBenefitsMgr::current().getCreateGroupCost();

4
indra/newview/llpanelpeople.cpp
View File

@ -1257,9 +1257,9 @@ void LLPanelPeople::onGroupLimitInfo()
args["MAX_BASIC"] = max_basic;
args["MAX_PREMIUM"] = max_premium;
if (LLAgentBenefitsMgr::has("Premium Plus"))
if (LLAgentBenefitsMgr::has("Premium_Plus"))
{
S32 max_premium_plus = LLAgentBenefitsMgr::get("Premium Plus").getGroupMembershipLimit();
S32 max_premium_plus = LLAgentBenefitsMgr::get("Premium_Plus").getGroupMembershipLimit();
args["MAX_PREMIUM_PLUS"] = max_premium_plus;
LLNotificationsUtil::add("GroupLimitInfoPlus", args);
}

6
indra/newview/llstartup.cpp
View File

@ -4295,12 +4295,6 @@ bool init_benefits(LLSD& response)
succ = false;
}
// FIXME PREMIUM - for testing if login does not yet provide Premium Plus. Should be removed thereafter.
//if (succ && !LLAgentBenefitsMgr::has("Premium Plus"))
//{
// LLAgentBenefitsMgr::init("Premium Plus", packages_sd["Premium"]["benefits"]);
// llassert(LLAgentBenefitsMgr::has("Premium Plus"));
//}
return succ;
}

2
indra/newview/skins/default/xui/de/strings.xml
View File

@ -5438,7 +5438,7 @@ Falls der Fehler weiterhin auftritt, überprüfen Sie bitte Ihre Netzwerk- und F
<string name="PremiumMembership">
Premium
</string>
<string name="Premium PlusMembership">
<string name="Premium_PlusMembership">
Premium Plus
</string>
<string name="MembershipUpgradeText">

2
indra/newview/skins/default/xui/en/strings.xml
View File

@ -2489,7 +2489,7 @@ If you continue to experience problems, please check your network and firewall s
<!-- SL Membership -->
<string name="BaseMembership">Base</string>
<string name="PremiumMembership">Premium</string>
<string name="Premium PlusMembership">Premium Plus</string>
<string name="Premium_PlusMembership">Premium Plus</string>
<string name="InternalMembership">Internal</string> <!-- No need to translate -->
<string name="MembershipUpgradeText">Upgrade to Premium</string>

2
indra/newview/skins/default/xui/fr/strings.xml
View File

@ -5332,7 +5332,7 @@ Si le problème persiste, vérifiez la configuration de votre réseau et de votr
<string name="PremiumMembership">
Premium
</string>
<string name="Premium PlusMembership">
<string name="Premium_PlusMembership">
Premium Plus
</string>
<string name="MembershipUpgradeText">

2
indra/newview/skins/default/xui/it/strings.xml
View File

@ -5177,7 +5177,7 @@ Segnala abuso
<string name="PremiumMembership">
Premium
</string>
<string name="Premium PlusMembership">
<string name="Premium_PlusMembership">
Premium Plus
</string>
<string name="DeleteItems">

2
indra/newview/skins/default/xui/ja/strings.xml
View File

@ -5222,7 +5222,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
<string name="PremiumMembership">
プレミアム会員
</string>
<string name="Premium PlusMembership">
<string name="Premium_PlusMembership">
プレミアムプラス会員
</string>
<string name="MembershipUpgradeText">

2
indra/newview/skins/default/xui/ru/strings.xml
View File

@ -5352,7 +5352,7 @@ https://www.firestormviewer.org/support за помощь в решении эт
<string name="PremiumMembership">
Премиум
</string>
<string name="Premium PlusMembership">
<string name="Premium_PlusMembership">
Премиум Плюс
</string>
<string name="MembershipUpgradeText">