diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-08-15 11:41:00 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-08-15 11:41:00 -0400 |
| commit | 402a2de7651105d63693deb2872dd6646dd1bd85 (patch) | |
| tree | 5b0935f876e954a024227355c34a2c23eebe1b8d /indra/newview/llfloatervoiceeffect.cpp | |
| parent | 60d15f78e17a2203d73d58c3f1c2af941d599277 (diff) | |
| parent | 6b70273603e4aa807662c301179d05a1f2f5a224 (diff) | |
merging latest viewer-mesh into nyx's sidebranch
Diffstat (limited to 'indra/newview/llfloatervoiceeffect.cpp')
| -rw-r--r-- | indra/newview/llfloatervoiceeffect.cpp | 2 |
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); |