diff options
author | paulgproductengine <none@none> | 2012-02-23 20:09:44 +0200 |
---|---|---|
committer | paulgproductengine <none@none> | 2012-02-23 20:09:44 +0200 |
commit | c37b3dde541805afe29ce3297ec5416ba3609127 (patch) | |
tree | 0cb24fd05c78ddea59d4b5dfb184e0a3c2dc858b /indra/newview/llfloatervoiceeffect.cpp | |
parent | d60ef2f3352404ce37d22ca346af47f8e4c93d79 (diff) |
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.
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); |