diff options
| author | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-07-29 16:49:18 +0300 |
|---|---|---|
| committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-07-29 16:49:18 +0300 |
| commit | 73aae80b55e087593b66e93e0f416ed28de07165 (patch) | |
| tree | 9aeb9ae0271437df4b159b90b15b2d6dc2fdd9f6 /indra | |
| parent | 1ba21762926167580c434e955646c986074988a3 (diff) | |
STORM-1473 FIXED Localized voice morph names.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloatervoiceeffect.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_voice_effect.xml | 40 |
2 files changed, 41 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); diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml index 9bf9cc6c77..2c754cd8d0 100644 --- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml +++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml @@ -25,6 +25,46 @@ <string name="new_voice_effect"> (New!) </string> + + <!-- effect names begin --> + <string name="effect_Arena">Arena</string> + <string name="effect_Beast">Beast</string> + <string name="effect_Buff">Buff</string> + <string name="effect_Buzz">Buzz</string> + <string name="effect_Camille">Camille</string> + <string name="effect_Creepy">Creepy</string> + <string name="effect_CreepyBot">CreepyBot</string> + <string name="effect_Cyber">Cyber</string> + <string name="effect_DeepBot">DeepBot</string> + <string name="effect_Demon">Demon</string> + <string name="effect_Flirty">Flirty</string> + <string name="effect_Foxy">Foxy</string> + <string name="effect_Halloween_2010_Bonus">Halloween_2010_Bonus</string> + <string name="effect_Helium">Helium</string> + <string name="effect_Husky">Husky</string> + <string name="effect_Intercom">Intercom</string> + <string name="effect_Macho">Macho</string> + <string name="effect_Micro">Micro</string> + <string name="effect_Mini">Mini</string> + <string name="effect_Nano">Nano</string> + <string name="effect_Nightmare">Nightmare</string> + <string name="effect_PopBot">PopBot</string> + <string name="effect_Rachel">Rachel</string> + <string name="effect_Radio">Radio</string> + <string name="effect_Robot">Robot</string> + <string name="effect_Roxanne">Roxanne</string> + <string name="effect_Sabrina">Sabrina</string> + <string name="effect_Samantha">Samantha</string> + <string name="effect_Sexy">Sexy</string> + <string name="effect_Shorty">Shorty</string> + <string name="effect_Sneaky">Sneaky</string> + <string name="effect_Stallion">Stallion</string> + <string name="effect_Sultry">Sultry</string> + <string name="effect_Thunder">Thunder</string> + <string name="effect_Vixen">Vixen</string> + <string name="effect_WhinyBot">WhinyBot</string> + <!-- effect names end --> + <text height="16" word_wrap="true" |