diff options
| author | Kitty Barnett <develop@catznip.com> | 2012-05-20 17:41:00 +0200 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2012-05-20 17:41:00 +0200 |
| commit | 1300f77fdd48d90d09a05058ffdf10df93092391 (patch) | |
| tree | 1cefd5cb64be5ae614b4930dcd0a55cf4fc06109 /indra/newview/llfloatervoiceeffect.cpp | |
| parent | 8199cc997aeaccc72b5bd5389ded8afc7b9c379c (diff) | |
| parent | aa0a0542a10ba6faeca34afd6e323b505493d8dc (diff) | |
Merged with viewer-beta
Diffstat (limited to 'indra/newview/llfloatervoiceeffect.cpp')
| -rw-r--r-- | indra/newview/llfloatervoiceeffect.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llfloatervoiceeffect.cpp b/indra/newview/llfloatervoiceeffect.cpp index 030fed0575..227720bee3 100644 --- a/indra/newview/llfloatervoiceeffect.cpp +++ b/indra/newview/llfloatervoiceeffect.cpp @@ -145,7 +145,9 @@ 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 = getString("effect_" + it->first); // will throw an error if the effect is not listed in the XML + + std::string localized_effect = "effect_" + it->first; + std::string effect_name = hasString(localized_effect) ? getString(localized_effect) : it->first; // XML contains localized effects names LLSD effect_properties = effect_interface->getVoiceEffectProperties(effect_id); |