summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatervoiceeffect.cpp
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2011-08-12 14:53:25 -0700
committerLeyla Farazha <leyla@lindenlab.com>2011-08-12 14:53:25 -0700
commit10ec0049125317d5c0bdd1bf89b96a54a9b2d873 (patch)
tree97efa1a6731aef7e703e1a6ca2eaa4a01dbb6fa8 /indra/newview/llfloatervoiceeffect.cpp
parente69efc8369a65008d41155717761fbaec0e309c5 (diff)
parent25f1653ca0a25c73b3c0649ee5bb7c65e5378eac (diff)
merge from viewer-experience
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);