EXT-7138 WIP Voice Morphing

Updated "Preview Voice Morphing" and "Get Voice Morphing" items in the Voice Effect combo

indra/newview/llpanelvoiceeffect.cpp

@@ -90,16 +90,16 @@ void LLPanelVoiceEffect::onCommitVoiceEffect()
 	}
 
 	LLSD value = mVoiceEffectCombo->getValue();
-	if (value.asInteger() == GET_VOICE_EFFECTS)
-	{
-		// Open the voice morphing info web page
-		LLWeb::loadURL(getString("get_voice_effects_url"));
-	}
-	else if (value.asInteger() == PREVIEW_VOICE_EFFECTS)
+	if (value.asInteger() == PREVIEW_VOICE_EFFECTS)
 	{
 		// Open the voice effects management floater
 		LLFloaterReg::showInstance("voice_effect");
 	}
+	else if (value.asInteger() == GET_VOICE_EFFECTS)
+	{
+		// Open the voice morphing info web page
+		LLWeb::loadURL(getString("get_voice_effects_url"));
+	}
 	else
 	{
 		effect_interface->setVoiceEffect(value.asUUID());
@@ -140,8 +140,8 @@ void LLPanelVoiceEffect::update()
 			mVoiceEffectCombo->addSeparator();
 		}
 
-		mVoiceEffectCombo->add(getString("get_voice_effects"), GET_VOICE_EFFECTS);
 		mVoiceEffectCombo->add(getString("preview_voice_effects"), PREVIEW_VOICE_EFFECTS);
+		mVoiceEffectCombo->add(getString("get_voice_effects"), GET_VOICE_EFFECTS);
 
 		mVoiceEffectCombo->setValue(effect_interface->getVoiceEffect());
 		mVoiceEffectCombo->setEnabled(true);

indra/newview/llpanelvoiceeffect.h

@@ -62,8 +62,8 @@ private:
 	typedef enum e_voice_effect_combo_items
 	{
 		NO_VOICE_EFFECT = 0,
-		GET_VOICE_EFFECTS = 1,
-		PREVIEW_VOICE_EFFECTS = 2
+		PREVIEW_VOICE_EFFECTS = 1,
+		GET_VOICE_EFFECTS = 2
 	} EVoiceEffectComboItems;
 	
 	LLComboBox* mVoiceEffectCombo;

indra/newview/skins/default/xui/en/floater_voice_effect.xml

@@ -5,7 +5,7 @@
  height="465"
  name="voice_effects"
  help_topic="voice_effects"
- title="VOICE EFFECTS"
+ title="PREVIEW VOICE MORPHING"
  background_visible="true"
  follows="all"
  label="Places"

indra/newview/skins/default/xui/en/panel_voice_effect.xml

@@ -11,11 +11,11 @@
   <string name="get_voice_effects_url">
     http://secondlife.com/landing/v0icem0rphingt3st
   </string>
-  <string name="get_voice_effects">
-    Add voice effects  ▶
-  </string>
   <string name="preview_voice_effects">
-    Preview  ▶
+    Preview Voice Morphing  ▶
+  </string>
+  <string name="get_voice_effects">
+    Get Voice Morphing  ▶
   </string>
   <combo_box
    enabled="false"