summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatervoiceeffect.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2012-03-01 13:31:17 -0800
committerMerov Linden <merov@lindenlab.com>2012-03-01 13:31:17 -0800
commit24789f11cc58cf7c03283a8e9648085a5cb9d7d8 (patch)
treebade7e21ca009bdb6a9f89b155732876bb02035d /indra/newview/llfloatervoiceeffect.cpp
parenta7499dc4abfa5fa7582dc7ebb535a07ed94d0c4f (diff)
parent66f101bac591d82b71ab7dc976b6fed0ed451909 (diff)
Pull from viewer-experience
Diffstat (limited to 'indra/newview/llfloatervoiceeffect.cpp')
-rw-r--r--indra/newview/llfloatervoiceeffect.cpp4
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);