diff options
| author | Aimee Linden <aimee@lindenlab.com> | 2010-05-23 14:11:48 +0100 |
|---|---|---|
| committer | Aimee Linden <aimee@lindenlab.com> | 2010-05-23 14:11:48 +0100 |
| commit | 234b3edc26db7cf87a11fc16d9720bf4a9c20177 (patch) | |
| tree | 891d92df46d3ec371295dfdd3fefe8001f751c61 | |
| parent | 6e98ca08300fad1fa8a4a5ab3996e1a6f8318564 (diff) | |
EXT-7337 WIP Added explanatory note to the voice morph preview floater
| -rw-r--r-- | indra/newview/llfloatervoiceeffect.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_voice_effect.xml | 21 |
2 files changed, 21 insertions, 2 deletions
diff --git a/indra/newview/llfloatervoiceeffect.cpp b/indra/newview/llfloatervoiceeffect.cpp index 1afea66d91..49dd6fa4d9 100644 --- a/indra/newview/llfloatervoiceeffect.cpp +++ b/indra/newview/llfloatervoiceeffect.cpp @@ -65,6 +65,8 @@ LLFloaterVoiceEffect::~LLFloaterVoiceEffect() BOOL LLFloaterVoiceEffect::postBuild() { setDefaultBtn("record_btn"); + getChild<LLButton>("record_btn")->setFocus(true); + mVoiceEffectList = getChild<LLScrollListCtrl>("voice_effect_list"); if (mVoiceEffectList) 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 728beece6b..acd70bce8e 100644 --- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml +++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml @@ -2,7 +2,7 @@ <floater legacy_header_height="18" can_resize="true" - height="465" + height="415" name="voice_effects" help_topic="voice_effects" title="PREVIEW VOICE MORPHING" @@ -26,12 +26,13 @@ New! </string> <scroll_list - bottom_delta="400" + bottom_delta="300" draw_heading="true" follows="all" layout="topleft" left="0" multi_select="false" + tool_tip="Record a sample of your voice, then click an effect to preview." top="20" name="voice_effect_list"> <scroll_list.columns @@ -108,6 +109,21 @@ </button> --> </panel> + <text + height="40" + word_wrap="true" + use_ellipses="true" + type="string" + text_color="LabelSelectedDisabledColor" + length="1" + follows="left|bottom|right" + layout="topleft" + left="6" + name="status_text" + top_pad="10" + width="300"> + Record a sample of your voice, and then select an effect to preview. Close this window to return to in-world voice. + </text> <button follows="left|bottom" height="23" @@ -115,6 +131,7 @@ layout="topleft" left="6" name="record_btn" + tool_tip="Record a sample of your voice." top_pad="5" width="135"> <button.commit_callback |