From b0b07b9438a8c90e4f8f68743310354b28583d5e Mon Sep 17 00:00:00 2001 From: Aimee Linden Date: Thu, 20 May 2010 22:55:47 +0100 Subject: EXT-7138 WIP Voice Morphing - Reselect "No voice effect" correctly in the voice effect combo if "Preview" or "Add effects" is chosen while no effects are enabled. --- indra/newview/llpanelvoiceeffect.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/llpanelvoiceeffect.cpp b/indra/newview/llpanelvoiceeffect.cpp index 6210fc7cc7..daafb451e0 100644 --- a/indra/newview/llpanelvoiceeffect.cpp +++ b/indra/newview/llpanelvoiceeffect.cpp @@ -126,7 +126,7 @@ void LLPanelVoiceEffect::update() } mVoiceEffectCombo->removeall(); - mVoiceEffectCombo->add(getString("no_voice_effect"), NO_VOICE_EFFECT); + mVoiceEffectCombo->add(getString("no_voice_effect"), LLUUID::null); mVoiceEffectCombo->addSeparator(); const voice_effect_list_t& effect_list = effect_interface->getVoiceEffectList(); -- cgit v1.2.3