diff options
| author | Aimee Linden <aimee@lindenlab.com> | 2010-05-22 15:24:08 +0100 |
|---|---|---|
| committer | Aimee Linden <aimee@lindenlab.com> | 2010-05-22 15:24:08 +0100 |
| commit | 05157c9985d955bb62c9ef897cee6298500c762d (patch) | |
| tree | fe1868c53959c1a4f1fb90bb7407c511ea9950b2 /indra/newview/llpanelvoiceeffect.cpp | |
| parent | 2e79f84155535991cdb9eccad80e14c7fa1d7ac6 (diff) | |
EXT-7138 WIP Voice Morphing
Updated "Preview Voice Morphing" and "Get Voice Morphing" items in the Voice Effect combo
Diffstat (limited to 'indra/newview/llpanelvoiceeffect.cpp')
| -rw-r--r-- | indra/newview/llpanelvoiceeffect.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/newview/llpanelvoiceeffect.cpp b/indra/newview/llpanelvoiceeffect.cpp index daafb451e0..915d547056 100644 --- a/indra/newview/llpanelvoiceeffect.cpp +++ b/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); |