summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatervoiceeffect.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-08-09 10:21:07 -0400
committerOz Linden <oz@lindenlab.com>2011-08-09 10:21:07 -0400
commitfc0166380bad07768f3c7ac4a5166892a27a493e (patch)
tree85e2b81b1f52df8613e1971d561e0b3dd86effe5 /indra/newview/llfloatervoiceeffect.cpp
parent4ff281ab946780c4ebefc9127372806746dc2b33 (diff)
parent73aae80b55e087593b66e93e0f416ed28de07165 (diff)
merge changes for storm-1473
Diffstat (limited to 'indra/newview/llfloatervoiceeffect.cpp')
-rw-r--r--indra/newview/llfloatervoiceeffect.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloatervoiceeffect.cpp b/indra/newview/llfloatervoiceeffect.cpp
index 2a3950f9b1..030fed0575 100644
--- a/indra/newview/llfloatervoiceeffect.cpp
+++ b/indra/newview/llfloatervoiceeffect.cpp
@@ -145,7 +145,7 @@ void LLFloaterVoiceEffect::refreshEffectList()
for (voice_effect_list_t::const_iterator it = template_list.begin(); it != template_list.end(); ++it)
{
const LLUUID& effect_id = it->second;
- std::string effect_name = it->first;
+ std::string effect_name = getString("effect_" + it->first); // will throw an error if the effect is not listed in the XML
LLSD effect_properties = effect_interface->getVoiceEffectProperties(effect_id);