summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-01-26 16:30:38 -0800
committerRichard Linden <none@none>2012-01-26 16:30:38 -0800
commitbbc265a9d5230603b7ee1b3f974ef27154d8507f (patch)
tree4d9bbacc2aa386912d8c56f9bf0852276b99214a /indra/newview
parentce9ff40c64929cef8c8f422723ce631735774c9a (diff)
EXP-1846 FIX Text positioning issues in Floaters, Notifications, UI, and toasts with UI size smaller than 1
also, re-enabled floater_test_textbox.xml
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/skins/default/xui/en/floater_test_textbox.xml17
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>