diff options
| -rw-r--r-- | indra/newview/llfloatervoiceeffect.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_voice_effect.xml | 51 |
2 files changed, 29 insertions, 27 deletions
diff --git a/indra/newview/llfloatervoiceeffect.cpp b/indra/newview/llfloatervoiceeffect.cpp index 46356cf161..b47d562995 100644 --- a/indra/newview/llfloatervoiceeffect.cpp +++ b/indra/newview/llfloatervoiceeffect.cpp @@ -189,19 +189,20 @@ void LLFloaterVoiceEffect::refreshEffectList() if (!is_template_only) { element["columns"][1]["value"] = expiry_date; + element["columns"][1]["type"] = "date"; } else { element["columns"][1]["value"] = ""; } element["columns"][1]["font"]["name"] = "SANSSERIF"; - element["columns"][1]["font"]["style"] = font_style; + element["columns"][1]["font"]["style"] = "NORMAL"; LLScrollListItem* sl_item = mVoiceEffectList->addElement(element, ADD_BOTTOM); // *HACK: Copied from llfloatergesture.cpp : ["font"]["style"] does not affect font style :( if(sl_item) { LLFontGL::StyleFlags style = is_template_only ? LLFontGL::NORMAL : LLFontGL::BOLD; - ((LLScrollListText*)sl_item->getColumn(0))->setFontStyle(style); + dynamic_cast<LLScrollListText*>(sl_item->getColumn(0))->setFontStyle(style); } } } 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 f79d4fd35c..4f4b20066d 100644 --- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml +++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml @@ -11,8 +11,8 @@ label="Places" layout="topleft" min_height="350" - min_width="240" - width="300"> + min_width="300" + width="455"> <string name="no_voice_effect"> (No Voice Effect) </string> @@ -33,18 +33,19 @@ name="status_text" right="-10" top="25"> - Record a sample of your voice, and then select an effect to preview. Close this window to return to in-world voice. +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|top" height="23" label="Record Sample" layout="topleft" - left="5" + left="10" name="record_btn" tool_tip="Record a sample of your voice." top_pad="5" - width="135"> + width="150"> <button.commit_callback function="VoiceEffect.Record" /> </button> @@ -56,41 +57,41 @@ left_delta="0" name="record_stop_btn" top_delta="0" - width="135"> + width="150"> <button.commit_callback function="VoiceEffect.Stop" /> </button> + <text + height="18" + halign="right" + use_ellipses="true" + type="string" + follows="left|top|right" + layout="topleft" + left_pad="10" + name="voice_morphing_link" + right="-10" + top_delta="5"> + [[URL] Get Voice Morphing] + </text> <scroll_list - bottom_delta="280" + bottom="-10" draw_heading="true" follows="all" layout="topleft" - left_delta="0" + left="10" multi_select="false" name="voice_effect_list" - right="-5" + right="-10" tool_tip="Record a sample of your voice, then click an effect to preview." top="100"> <scroll_list.columns - dynamic_width="true" label="Voice Effect" - name="name"/> + name="name" relative_width="0.41"/> <scroll_list.columns + dynamic_width="true" label="Expires" name="expires" - width="110" /> + relative_width="0.59" /> </scroll_list> - <text - height="20" - word_wrap="true" - use_ellipses="true" - type="string" - follows="left|bottom|right" - layout="topleft" - left="10" - name="voice_morphing_link" - right="-10" - top_pad="5"> - [[URL] Get Voice Morphing] - </text> </floater> |