From 3faad84a533b80e4a40e29e880d1608ffb0763ef Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Tue, 21 Feb 2017 18:01:23 +0200
Subject: [PATCH] MAINT-7036 Communicate Menu - Voice Morphing - Subscribe Now
options - update
---
indra/newview/llviewermenu.cpp | 9 ++++++++-
indra/newview/skins/default/xui/en/menu_viewer.xml | 6 ++++++
indra/newview/skins/default/xui/en/strings.xml | 3 ++-
3 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 99b7a98abc7..d847661ce71 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -8618,7 +8618,12 @@ class LLUploadCostCalculator : public view_listener_t
void handle_voice_morphing_subscribe()
{
- LLWeb::loadURLExternal(LLTrans::getString("voice_morphing_url"));
+ LLWeb::loadURL(LLTrans::getString("voice_morphing_url"));
+}
+
+void handle_premium_voice_morphing_subscribe()
+{
+ LLWeb::loadURL(LLTrans::getString("premium_voice_morphing_url"));
}
class LLToggleUIHints : public view_listener_t
@@ -8814,6 +8819,8 @@ void initialize_menus()
// Communicate > Voice morphing > Subscribe...
commit.add("Communicate.VoiceMorphing.Subscribe", boost::bind(&handle_voice_morphing_subscribe));
+ // Communicate > Voice morphing > Premium perk...
+ commit.add("Communicate.VoiceMorphing.PremiumPerk", boost::bind(&handle_premium_voice_morphing_subscribe));
LLVivoxVoiceClient * voice_clientp = LLVivoxVoiceClient::getInstance();
enable.add("Communicate.VoiceMorphing.NoVoiceMorphing.Check"
, boost::bind(&LLVivoxVoiceClient::onCheckVoiceEffect, voice_clientp, "NoVoiceMorphing"));
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 332d79e1eac..c96b7ae673b 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -337,6 +337,12 @@
<menu_item_call.on_click
function="Communicate.VoiceMorphing.Subscribe" />
</menu_item_call>
+ <menu_item_call
+ label="Premium perk..."
+ name="PremiumPerk">
+ <menu_item_call.on_click
+ function="Communicate.VoiceMorphing.PremiumPerk" />
+ </menu_item_call>
</menu>
<menu_item_check
label="Gestures..."
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index aad2c611f42..1d2c068e647 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3739,7 +3739,8 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="Home position set.">Home position set.</string>
- <string name="voice_morphing_url">http://secondlife.com/landing/voicemorphing</string>
+ <string name="voice_morphing_url">https://secondlife.com/destination/voice-island</string>
+ <string name="premium_voice_morphing_url">https://secondlife.com/destination/voice-morphing-premium</string>
<!-- Financial operations strings -->
<string name="paid_you_ldollars">[NAME] paid you L$[AMOUNT] [REASON].</string>
--
GitLab