diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-05-05 18:57:03 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-05-11 21:05:46 +0300 |
commit | 63095005578007345d9916ebc6855246cdb08c7c (patch) | |
tree | 90a4031ae2980326ace3abd2c13e2439a230b762 /indra/newview | |
parent | f0fa74fde742b23f7de007140bd6c380550a513f (diff) |
SL-17356 Viewer changes for Premium Plus support
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/llpanelgroupcreate.cpp | 2 | ||||
-rw-r--r-- | indra/newview/llpanelpeople.cpp | 4 | ||||
-rw-r--r-- | indra/newview/llstartup.cpp | 6 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/de/strings.xml | 2 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 2 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/fr/strings.xml | 2 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/it/strings.xml | 2 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/ja/strings.xml | 2 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/ru/strings.xml | 2 |
9 files changed, 9 insertions, 15 deletions
diff --git a/indra/newview/llpanelgroupcreate.cpp b/indra/newview/llpanelgroupcreate.cpp index 52be75072c..01a4ab0455 100644 --- a/indra/newview/llpanelgroupcreate.cpp +++ b/indra/newview/llpanelgroupcreate.cpp @@ -104,7 +104,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(); diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp index 5997d522c4..e424d6b5f5 100644 --- a/indra/newview/llpanelpeople.cpp +++ b/indra/newview/llpanelpeople.cpp @@ -1090,9 +1090,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); } diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 5c0bb36d31..98b2bc703b 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -3333,12 +3333,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; } diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml index f021e03dc7..ba26f721fe 100644 --- a/indra/newview/skins/default/xui/de/strings.xml +++ b/indra/newview/skins/default/xui/de/strings.xml @@ -5101,7 +5101,7 @@ Bitte überprüfen Sie http://status.secondlifegrid.net, um herauszufinden, ob e <string name="PremiumMembership"> Premium </string> - <string name="Premium PlusMembership"> + <string name="Premium_PlusMembership"> Premium Plus </string> <string name="DeleteItems"> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 866196a760..acb3a720b9 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3964,7 +3964,7 @@ Please check http://status.secondlifegrid.net to see if there is a known problem <!-- 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> diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml index 9fde703d6c..f7545f08d2 100644 --- a/indra/newview/skins/default/xui/fr/strings.xml +++ b/indra/newview/skins/default/xui/fr/strings.xml @@ -5102,7 +5102,7 @@ Veuillez vous reporter à http://status.secondlifegrid.net afin de déterminer s <string name="PremiumMembership"> Premium </string> - <string name="Premium PlusMembership"> + <string name="Premium_PlusMembership"> Premium Plus </string> <string name="DeleteItems"> diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml index 3049828f46..7690e02692 100644 --- a/indra/newview/skins/default/xui/it/strings.xml +++ b/indra/newview/skins/default/xui/it/strings.xml @@ -5017,7 +5017,7 @@ Consulta la pagina http://status.secondlifegrid.net per determinare se il proble <string name="PremiumMembership"> Premium </string> - <string name="Premium PlusMembership"> + <string name="Premium_PlusMembership"> Premium Plus </string> <string name="DeleteItems"> diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml index dcd6e65d34..b4bc36a800 100644 --- a/indra/newview/skins/default/xui/ja/strings.xml +++ b/indra/newview/skins/default/xui/ja/strings.xml @@ -5100,7 +5100,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ <string name="PremiumMembership"> プレミアム </string> - <string name="Premium PlusMembership"> + <string name="Premium_PlusMembership"> プレミアムプラス </string> <string name="DeleteItems"> diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml index 43a87b2b18..ee2dcfe9cc 100644 --- a/indra/newview/skins/default/xui/ru/strings.xml +++ b/indra/newview/skins/default/xui/ru/strings.xml @@ -5096,7 +5096,7 @@ support@secondlife.com. <string name="PremiumMembership"> Премиум </string> - <string name="Premium PlusMembership"> + <string name="Premium_PlusMembership"> Премиум Плюс </string> <string name="DeleteItems"> |