diff options
author | Merov Linden <merov@lindenlab.com> | 2012-01-27 18:41:56 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2012-01-27 18:41:56 -0800 |
commit | 84b7ff7915207dffad8da7aba959ab36bfa49c0f (patch) | |
tree | 141b286cd1bdf810c5ba15131ad36ab5df3e196d /indra/newview/skins/default/xui/en/floater_test_textbox.xml | |
parent | 2cd7a7550991df90288aa4c7e2fbe2598cc3c296 (diff) | |
parent | f53a72ec2c40ae04cee6dee2f58d76c5fedeca99 (diff) |
Pull from viewer-experience
Diffstat (limited to 'indra/newview/skins/default/xui/en/floater_test_textbox.xml')
-rw-r--r-- | indra/newview/skins/default/xui/en/floater_test_textbox.xml | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_test_textbox.xml b/indra/newview/skins/default/xui/en/floater_test_textbox.xml index 3d1bc0edae..1d31fbd6dc 100644 --- a/indra/newview/skins/default/xui/en/floater_test_textbox.xml +++ b/indra/newview/skins/default/xui/en/floater_test_textbox.xml @@ -8,18 +8,7 @@ help_topic="floater_test_textbox" translate="false" width="800"> - <text - type="string" - length="1" - height="90" - layout="topleft" - left="10" - valign="bottom" - clip="true" - top_pad="30" - width="300"> -___</text> - <!--<text + <text clip_partial="true" top_pad="10" left="10" @@ -150,7 +139,7 @@ ___</text> The 华文细黑 brown fox ヒラキjumped over the lazy dog. </text> ---><!-- next column --><!-- +<!-- next column --> <text_editor height="50" follows="top|left|bottom" @@ -247,5 +236,5 @@ with multiple lines and too many lines to actually fit - </text>--> + </text> </floater> |