EXT-7138 WIP Changed UI text to use "Voice Morph" everywhere instead of "Voice Effect".

Revised wording in preview floater (DEV-50573).
Added tool-tip for Voice Morphing control in Nearby Voice (DEV-50608).

8 files changed, 31 insertions, 29 deletions

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 505403b155..4dd121fd22 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10609,7 +10609,7 @@
     <key>VoiceEffectExpiryWarningTime</key>
     <map>
       <key>Comment</key>
-      <string>How much notice to give of voice effect subscriptions expiry, in seconds.</string>
+      <string>How much notice to give of Voice Morph subscriptions expiry, in seconds.</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -10620,7 +10620,7 @@
     <key>VoiceMorphingEnabled</key>
     <map>
       <key>Comment</key>
-      <string>Whether or not to enable Voice Effects and show the UI.</string>
+      <string>Whether or not to enable Voice Morphs and show the UI.</string>
       <key>Persist</key>
       <integer>0</integer>
       <key>Type</key>
diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml
index c94ae1fca1..d4000e9253 100644
--- a/indra/newview/app_settings/settings_per_account.xml
+++ b/indra/newview/app_settings/settings_per_account.xml
@@ -102,7 +102,7 @@
     <key>VoiceEffectDefault</key>
     <map>
         <key>Comment</key>
-            <string>Selected voice effect</string>
+            <string>Selected Voice Morph</string>
         <key>Persist</key>
             <integer>1</integer>
         <key>Type</key>
diff --git a/indra/newview/llfloatervoiceeffect.cpp b/indra/newview/llfloatervoiceeffect.cpp
index d27adfcea1..22392dca8b 100644
--- a/indra/newview/llfloatervoiceeffect.cpp
+++ b/indra/newview/llfloatervoiceeffect.cpp
@@ -114,7 +114,7 @@ void LLFloaterVoiceEffect::refreshEffectList()
 		return;
 	}
 
-	LL_DEBUGS("Voice")<< "Rebuilding voice effect list."<< LL_ENDL;
+	LL_DEBUGS("Voice")<< "Rebuilding Voice Morph list."<< LL_ENDL;
 
 	// Preserve selected items and scroll position
 	S32 scroll_pos = mVoiceEffectList->getScrollPos();
@@ -128,7 +128,7 @@ void LLFloaterVoiceEffect::refreshEffectList()
 	mVoiceEffectList->deleteAllItems();
 
 	{
-		// Add the "No Voice Effect" entry
+		// Add the "No Voice Morph" entry
 		LLSD element;
 
 		element["id"] = LLUUID::null;
@@ -145,7 +145,7 @@ void LLFloaterVoiceEffect::refreshEffectList()
 		}
 	}
 
-	// Add each Voice Effect template, if there are any (template list includes all usable effects)
+	// Add each Voice Morph template, if there are any (template list includes all usable effects)
 	const voice_effect_list_t& template_list = effect_interface->getVoiceEffectTemplateList();
 	if (!template_list.empty())
 	{
diff --git a/indra/newview/llpanelvoiceeffect.cpp b/indra/newview/llpanelvoiceeffect.cpp
index 707e05048e..fd470798ee 100644
--- a/indra/newview/llpanelvoiceeffect.cpp
+++ b/indra/newview/llpanelvoiceeffect.cpp
@@ -1,7 +1,7 @@
 /** 
  * @file llpanelvoiceeffect.cpp
  * @author Aimee
- * @brief Panel to select Voice Effects.
+ * @brief Panel to select Voice Morphs.
  *
  * $LicenseInfo:firstyear=2010&license=viewergpl$
  * 
@@ -102,7 +102,7 @@ void LLPanelVoiceEffect::onCommitVoiceEffect()
 	LLSD value = mVoiceEffectCombo->getValue();
 	if (value.asInteger() == PREVIEW_VOICE_EFFECTS)
 	{
-		// Open the voice effects management floater
+		// Open the Voice Morph preview floater
 		LLFloaterReg::showInstance("voice_effect");
 	}
 	else if (value.asInteger() == GET_VOICE_EFFECTS)
@@ -131,12 +131,12 @@ void LLPanelVoiceEffect::update(bool list_updated)
 		LLVoiceEffectInterface* effect_interface = LLVoiceClient::instance().getVoiceEffectInterface();
 		if (list_updated)
 		{
-			// Add the default "No Voice Effect" entry.
+			// Add the default "No Voice Morph" entry.
 			mVoiceEffectCombo->removeall();
 			mVoiceEffectCombo->add(getString("no_voice_effect"), LLUUID::null);
 			mVoiceEffectCombo->addSeparator();
 
-			// Add entries for each Voice Effect.
+			// Add entries for each Voice Morph.
 			const voice_effect_list_t& effect_list = effect_interface->getVoiceEffectList();
 			if (!effect_list.empty())
 			{
@@ -155,7 +155,7 @@ void LLPanelVoiceEffect::update(bool list_updated)
 
 		if (effect_interface && LLVoiceClient::instance().isVoiceWorking())
 		{
-			// Select the current voice effect.
+			// Select the current Voice Morph.
 			mVoiceEffectCombo->setValue(effect_interface->getVoiceEffect());
 			mVoiceEffectCombo->setEnabled(true);
 		}
diff --git a/indra/newview/llpanelvoiceeffect.h b/indra/newview/llpanelvoiceeffect.h
index c773b4ce94..79f9d2fe75 100644
--- a/indra/newview/llpanelvoiceeffect.h
+++ b/indra/newview/llpanelvoiceeffect.h
@@ -58,7 +58,7 @@ private:
 	/// Called by voice effect provider when voice effect list is changed.
 	virtual void onVoiceEffectChanged(bool effect_list_updated);
 
-	// Fixed entries in the voice effect list
+	// Fixed entries in the Voice Morph list
 	typedef enum e_voice_effect_combo_items
 	{
 		NO_VOICE_EFFECT = 0,
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 4f4b20066d..207397d3dc 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
@@ -2,7 +2,7 @@
 <floater
  legacy_header_height="18"
  can_resize="true"
- height="400"
+ height="420"
  name="voice_effects"
  help_topic="voice_effects"
  title="PREVIEW VOICE MORPHING"
@@ -11,10 +11,10 @@
  label="Places"
  layout="topleft"
  min_height="350"
- min_width="300"
+ min_width="330"
  width="455">
   <string name="no_voice_effect">
-    (No Voice Effect)
+    (No Voice Morph)
   </string>
   <string name="active_voice_effect">
     (Active)
@@ -23,7 +23,7 @@
     (New!)
   </string>
   <text
-   height="40"
+   height="68"
    word_wrap="true"
    use_ellipses="true"
    type="string"
@@ -33,8 +33,9 @@
    name="status_text"
    right="-10"
    top="25">
-Record a sample of your voice, and then select an effect to preview.
-Close this window to return to in-world voice.
+To preview any of the Voice Morphing effects, click the Record button to record a short snippet of voice, then click any Voice Morph in the list to hear how it will sound.
+
+To reconnect to Nearby Voice simply close this window.
   </text>
   <button
    follows="left|top"
@@ -84,9 +85,9 @@ Close this window to return to in-world voice.
    name="voice_effect_list"
    right="-10"
    tool_tip="Record a sample of your voice, then click an effect to preview."
-   top="100">
+   top="128">
     <scroll_list.columns
-     label="Voice Effect"
+     label="Voice Morph"
      name="name" relative_width="0.41"/>
     <scroll_list.columns
      dynamic_width="true"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index b997dee30c..99896e46c9 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5962,8 +5962,8 @@ We are creating a voice channel for you. This may take up to one minute.
    sound="UISndAlert"
    persist="true"
    type="notify">
-Subscribed Voice Effects have expired.
-[[URL] Renew your subscription] to reactivate them.
+One or more of your subscribed Voice Morphs has expired.
+[[URL] Click here] to renew your subscription.
     <unique/>
   </notification>
 
@@ -5973,8 +5973,8 @@ Subscribed Voice Effects have expired.
    sound="UISndAlert"
    persist="true"
    type="notify">
-The active Voice Effect has expired, your normal voice settings have been applied.
-[[URL] Renew your subscription] to reactivate it.
+The active Voice Morph has expired, your normal voice settings have been applied.
+[[URL] Click here] to renew your subscription.
     <unique/>
   </notification>
 
@@ -5984,8 +5984,8 @@ The active Voice Effect has expired, your normal voice settings have been applie
    sound="UISndAlert"
    persist="true"
    type="notify">
-Voice Effects will expire in less than [INTERVAL] days.
-[[URL] Renew your subscription] or they will be removed.
+One or more of your Voice Morphs will expire in less than [INTERVAL] days.
+[[URL] Click here] to renew your subscription.
     <unique/>
   </notification>
 		LLNotificationsUtil::add("VoiceEffectsNew");
@@ -5996,7 +5996,7 @@ Voice Effects will expire in less than [INTERVAL] days.
    sound="UISndAlert"
    persist="true"
    type="notify">
-New Voice Effects are available!
+New Voice Morphs are available!
     <unique/>
   </notification>
 
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 9b6548ef9c..c575ca468c 100644
--- a/indra/newview/skins/default/xui/en/panel_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/panel_voice_effect.xml
@@ -6,7 +6,7 @@
  name="panel_voice_effect"
  width="200">
   <string name="no_voice_effect">
-    No Voice Effect
+    No Voice Morph
   </string>
   <string name="preview_voice_effects">
     Preview Voice Morphing  ▶
@@ -19,10 +19,11 @@
    follows="left|top|right"
    height="23"
    name="voice_effect"
+   tool_tip="Select a Voice Morphing effect to change your voice."
    top_pad="0"
    width="200">
     <combo_box.item
-     label="No Voice Effect"
+     label="No Voice Morph"
      name="no_voice_effect"
 	 top_pad="0"
      value="0" />