diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-06-19 11:35:20 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-06-19 11:35:20 -0700 |
| commit | 3af9d7c0535c8d94b194952c98196bac1d8c3dda (patch) | |
| tree | 68b347e9303f814de271cc27f38f19ae5a6fa4e2 /indra/newview/skins | |
| parent | b882fe3b8dde9338c092922672015f975ca09587 (diff) | |
| parent | ad4ae5583534197cb00c13d769e504fcde4d19d5 (diff) | |
Merge pull from richard/viewer-chui
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_im_session.xml | 9 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/text.xml | 1 |
2 files changed, 7 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml index a4695b8c09..f6d5b20a65 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -242,18 +242,21 @@ bottom="-1" follows="left|right|bottom" tab_group="1"> - <line_editor + <text_editor bottom="0" + expand_lines_count="5" follows="left|right|bottom" font="SansSerifSmall" visible="true" height="20" + is_expandable="true" label="To" layout="bottomleft" name="chat_editor" tab_group="3" - width="220"> - </line_editor> + width="240" + wrap="true"> + </text_editor> </panel> </layout_panel> </layout_stack> diff --git a/indra/newview/skins/default/xui/en/widgets/text.xml b/indra/newview/skins/default/xui/en/widgets/text.xml index 134f2d7522..2102074674 100644 --- a/indra/newview/skins/default/xui/en/widgets/text.xml +++ b/indra/newview/skins/default/xui/en/widgets/text.xml @@ -9,6 +9,7 @@ h_pad="0" allow_scroll="false" text_readonly_color="LabelTextColor" + text_tentative_color="TextFgTentativeColor" bg_writeable_color="FloaterDefaultBackgroundColor" use_ellipses="false" bg_visible="false" |