summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAimee Linden <aimee@lindenlab.com>2010-05-20 22:55:47 +0100
committerAimee Linden <aimee@lindenlab.com>2010-05-20 22:55:47 +0100
commitb0b07b9438a8c90e4f8f68743310354b28583d5e (patch)
treed1650813fca6e11074e1dfd2414644d5bb65b3c1 /indra
parentd80bc7f9766c9e7d9e8360bff27df6b35d9f927b (diff)
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.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llpanelvoiceeffect.cpp2
1 files changed, 1 insertions, 1 deletions
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();