From c37b3dde541805afe29ce3297ec5416ba3609127 Mon Sep 17 00:00:00 2001 From: paulgproductengine Date: Thu, 23 Feb 2012 20:09:44 +0200 Subject: EXP-1910 FIXED (Viewer usually crashes whith empty list of voice morphs ) - Added missed strings to the XML - Just adding unlocalized name to the effects list if localized string was not found in XML. I think it's a better than throwing an error. --- indra/newview/llfloatervoiceeffect.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/newview/llfloatervoiceeffect.cpp') 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); -- cgit v1.2.3