From 12171ddba3c70b73e53bf103a45779262b38c6ec Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Mon, 24 May 2010 00:20:03 +0100
Subject: EXT-7336 WIP Move the Voice Morphing marketing URL into strings.xml
 so it can be used in notifications as well.

---
 indra/newview/llfloatervoiceeffect.cpp                      |  2 +-
 indra/newview/llpanelvoiceeffect.cpp                        |  3 ++-
 indra/newview/skins/default/xui/en/floater_voice_effect.xml |  3 ---
 indra/newview/skins/default/xui/en/panel_voice_effect.xml   |  3 ---
 indra/newview/skins/default/xui/en/strings.xml              | 10 ++++++----
 5 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/indra/newview/llfloatervoiceeffect.cpp b/indra/newview/llfloatervoiceeffect.cpp
index 38c419ab24..e30a50fab7 100644
--- a/indra/newview/llfloatervoiceeffect.cpp
+++ b/indra/newview/llfloatervoiceeffect.cpp
@@ -282,7 +282,7 @@ void LLFloaterVoiceEffect::onClickStop()
 void LLFloaterVoiceEffect::onClickAdd()
 {
 	// Open the voice morphing info web page
-	LLWeb::loadURL(getString("get_voice_effects_url"));
+	LLWeb::loadURL(LLTrans::getString("voice_morphing_url"));
 }
 
 //void LLFloaterVoiceEffect::onClickActivate()
diff --git a/indra/newview/llpanelvoiceeffect.cpp b/indra/newview/llpanelvoiceeffect.cpp
index 915d547056..140feb7a54 100644
--- a/indra/newview/llpanelvoiceeffect.cpp
+++ b/indra/newview/llpanelvoiceeffect.cpp
@@ -38,6 +38,7 @@
 #include "llcombobox.h"
 #include "llfloaterreg.h"
 #include "llpanel.h"
+#include "lltrans.h"
 #include "llvoiceclient.h"
 
 static LLRegisterPanelClassWrapper<LLPanelVoiceEffect> t_panel_voice_effect("panel_voice_effect");
@@ -98,7 +99,7 @@ void LLPanelVoiceEffect::onCommitVoiceEffect()
 	else if (value.asInteger() == GET_VOICE_EFFECTS)
 	{
 		// Open the voice morphing info web page
-		LLWeb::loadURL(getString("get_voice_effects_url"));
+		LLWeb::loadURL(LLTrans::getString("voice_morphing_url"));
 	}
 	else
 	{
diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
index acd70bce8e..7335488e73 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
@@ -16,9 +16,6 @@
   <string name="no_voice_effect">
     (No Voice Effect)
   </string>
-  <string name="get_voice_effects_url">
-    http://secondlife.com/landing/v0icem0rphingt3st
-  </string>
   <string name="active_voice_effect">
     (Active)
   </string>
diff --git a/indra/newview/skins/default/xui/en/panel_voice_effect.xml b/indra/newview/skins/default/xui/en/panel_voice_effect.xml
index 9e5652d1e2..9b6548ef9c 100644
--- a/indra/newview/skins/default/xui/en/panel_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/panel_voice_effect.xml
@@ -8,9 +8,6 @@
   <string name="no_voice_effect">
     No Voice Effect
   </string>
-  <string name="get_voice_effects_url">
-    http://secondlife.com/landing/v0icem0rphingt3st
-  </string>
   <string name="preview_voice_effects">
     Preview Voice Morphing  ▶
   </string>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index f8bb36b88a..a54dd02927 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3086,10 +3086,12 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
   <string name="unread_chat_multiple">
     [SOURCES] have said something new
   </string>"
-	<string name="session_initialization_timed_out_error">
-		The session initialization is timed out
-	</string>
-  
+  <string name="session_initialization_timed_out_error">
+    The session initialization is timed out
+  </string>
+
+  <string name="voice_morphing_url">http://secondlife.com/landing/v0icem0rphingt3st</string>
+
   <!-- Financial operations strings -->
   <string name="paid_you_ldollars">[NAME] paid you L$[AMOUNT]</string>
   <string name="you_paid_ldollars">You paid [NAME] L$[AMOUNT] [REASON].</string>
-- 
cgit v1.2.3