diff options
author | James Cook <james@lindenlab.com> | 2009-12-07 15:16:39 -0800 |
---|---|---|
committer | James Cook <james@lindenlab.com> | 2009-12-07 15:16:39 -0800 |
commit | 7d905e61801407f43083ae12bda9460a1fcf4a90 (patch) | |
tree | 3594a06fe14d58efe3cb2d5024d6c82f79af7af5 /indra/newview/skins/default/xui/en | |
parent | ff4e86a645f72273baa8a79f479c5a63d15ae2a8 (diff) | |
parent | 81c18d54426ffe8a331350ac975770f36b5df201 (diff) |
merge
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r-- | indra/newview/skins/default/xui/en/floater_test_text_editor.xml | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_test_text_editor.xml b/indra/newview/skins/default/xui/en/floater_test_text_editor.xml index b0aa5c7c4f..8be0c28c5c 100644 --- a/indra/newview/skins/default/xui/en/floater_test_text_editor.xml +++ b/indra/newview/skins/default/xui/en/floater_test_text_editor.xml @@ -9,7 +9,6 @@ <text_editor height="50" follows="top|left|bottom" - layout="topleft" left="10" name="test_text_editor" tool_tip="text editor" @@ -17,4 +16,15 @@ width="200"> Text Editor </text_editor> + <text_editor + height="50" + follows="top|left|bottom" + font="SansSerif" + left="10" + name="test_text_editor" + tool_tip="text editor" + top_pad="10" + width="200"> + This contains long text and should scroll horizontally to the right + </text_editor> </floater> |