merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3

ignore-dead-branch

1 files changed, 336 insertions, 0 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_font_test.xml b/indra/newview/skins/default/xui/en/floater_font_test.xml
new file mode 100644
index 0000000000..8babbaa273
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_font_test.xml
@@ -0,0 +1,336 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ can_resize="true"
+ height="800"
+ layout="topleft"
+ min_height="175"
+ min_width="154"
+ name="contents"
+ title="Font Test"
+ width="500">
+    <text
+     type="string"
+     length="1"
+     bottom_delta="40"
+     follows="left|top|right"
+     height="16"
+     layout="topleft"
+     left="16">
+        SansSerifSmall
+    </text>
+    <text
+     type="string"
+     length="1"
+     bottom_delta="20"
+     follows="left|top|right"
+     font="SansSerifMedium"
+     height="16"
+     layout="topleft"
+     left="16">
+        SansSerifMedium
+    </text>
+    <text
+     type="string"
+     length="1"
+     bottom_delta="20"
+     follows="left|top|right"
+     font="SansSerif"
+     height="16"
+     layout="topleft"
+     left="16">
+        SansSerif, no size or style (should be same as medium)
+    </text>
+    <text
+     type="string"
+     length="1"
+     bottom_delta="20"
+     follows="left|top|right"
+     font="SansSerifLarge"
+     height="16"
+     layout="topleft"
+     left="16">
+        SansSerifLarge
+    </text>
+    <text
+     type="string"
+     length="1"
+     bottom_delta="36"
+     follows="left|top|right"
+     font="SansSerifHuge"
+     height="32"
+     layout="topleft"
+     left="16">
+        SansSerifHuge
+    </text>
+    <text
+     type="string"
+     length="1"
+     bottom_delta="40"
+     follows="left|top|right"
+     font="Monospace"
+     height="16"
+     layout="topleft"
+     left="16">
+        Monospace
+    </text>
+    <text
+     type="string"
+     length="1"
+     bottom_delta="20"
+     follows="left|top|right"
+     font="Monospace"
+     font.size="Large"
+     height="16"
+     layout="topleft"
+     left="16">
+        Monospace size=Large
+    </text>
+    <text
+     type="string"
+     length="1"
+     bottom_delta="20"
+     follows="left|top|right"
+     font="SansSerifLarge"
+     font.style="BOLD"
+     height="16"
+     layout="topleft"
+     left="16">
+        SansSerifLarge style=BOLD
+    </text>
+    <text
+     type="string"
+     length="1"
+     bottom_delta="20"
+     follows="left|top|right"
+     font="SansSerifBold"
+     height="16"
+     layout="topleft"
+     left="16">
+        SansSerifBold
+    </text>
+    <text
+     type="string"
+     length="1"
+     bottom_delta="20"
+     follows="left|top|right"
+     font="SansSerif"
+     font.style="BOLD"
+     height="16"
+     layout="topleft"
+     left="16">
+        SansSerif style=BOLD (should be same as SansSerifBold)
+    </text>
+    <text
+     type="string"
+     length="1"
+     bottom_delta="20"
+     follows="left|top|right"
+     font="SansSerif"
+     font.style="ITALIC"
+     height="16"
+     layout="topleft"
+     left="16">
+        SansSerif style=ITALIC
+    </text>
+    <text
+     type="string"
+     length="1"
+     bottom_delta="20"
+     follows="left|top|right"
+     font="SansSerif"
+     font.style="BOLD|ITALIC"
+     height="16"
+     layout="topleft"
+     left="16">
+        SansSerif style=BOLD|ITALIC
+    </text>
+    <text
+     type="string"
+     length="1"
+     bottom_delta="20"
+     follows="left|top|right"
+     font="SansSerif"
+     font.style="BOLD|ITALIC"
+     height="16"
+     layout="topleft"
+     left="16">
+        SansSerif style=BOLD|ITALIC shadow=soft
+    </text>
+    <text
+     type="string"
+     length="1"
+     bottom_delta="20"
+     follows="left|top|right"
+     font="SansSerif"
+     font.style="UNDERLINE"
+     height="16"
+     layout="topleft"
+     left="16">
+        SansSerif style=UNDERLINE
+    </text>
+    <text
+     type="string"
+     length="1"
+     bottom_delta="20"
+     follows="left|top|right"
+     font="SansSerif"
+     font_shadow="hard"
+     height="16"
+     layout="topleft"
+     left="16">
+        SansSerif style=hard
+    </text>
+    <text
+     type="string"
+     length="1"
+     bottom_delta="20"
+     follows="left|top|right"
+     font="SansSerif"
+     height="16"
+     layout="topleft"
+     left="16">
+        SansSerif shadow=soft
+    </text>
+    <text
+     type="string"
+     length="1"
+     bottom_delta="20"
+     follows="left|top|right"
+     font="DejaVu"
+     height="16"
+     layout="topleft"
+     left="16">
+        DejaVu
+    </text>
+    <text
+     type="string"
+     length="1"
+     bottom_delta="20"
+     follows="left|top|right"
+     font="DejaVu"
+     font.style="BOLD"
+     height="16"
+     layout="topleft"
+     left="16">
+        DejaVu style=BOLD
+    </text>
+    <text
+     type="string"
+     length="1"
+     bottom_delta="20"
+     follows="left|top|right"
+     font="DejaVu"
+     font.style="ITALIC"
+     height="16"
+     layout="topleft"
+     left="16">
+        DejaVu style=ITALIC
+    </text>
+    <text
+     type="string"
+     length="1"
+     bottom_delta="20"
+     follows="left|top|right"
+     font="DejaVu"
+     font.style="BOLD|ITALIC"
+     height="16"
+     layout="topleft"
+     left="16">
+        DejaVu style=BOLD|ITALIC
+    </text>
+    <text
+     type="string"
+     length="1"
+     bottom_delta="20"
+     follows="left|top|right"
+     font="DejaVu"
+     font.size="Large"
+     font.style="BOLD|ITALIC"
+     height="16"
+     layout="topleft"
+     left="16">
+        DejaVu size=Large style=BOLD|ITALIC
+    </text>
+    <text
+     type="string"
+     length="1"
+     bottom_delta="20"
+     follows="left|top|right"
+     font="Helvetica"
+     height="16"
+     layout="topleft"
+     left="16">
+        Helvetica
+    </text>
+    <text
+     type="string"
+     length="1"
+     bottom_delta="20"
+     follows="left|top|right"
+     font="Helvetica"
+     font.style="BOLD"
+     height="16"
+     layout="topleft"
+     left="16">
+        Helvetica style=BOLD
+    </text>
+    <text
+     type="string"
+     length="1"
+     bottom_delta="20"
+     follows="left|top|right"
+     font="Helvetica"
+     font.style="ITALIC"
+     height="16"
+     layout="topleft"
+     left="16">
+        Helvetica style=ITALIC
+    </text>
+    <text
+     type="string"
+     length="1"
+     bottom_delta="20"
+     follows="left|top|right"
+     font="Helvetica"
+     font.style="BOLD|ITALIC"
+     height="16"
+     layout="topleft"
+     left="16">
+        Helvetica style=BOLD|ITALIC
+    </text>
+    <text
+     type="string"
+     length="1"
+     bottom_delta="20"
+     follows="left|top|right"
+     font="Helvetica"
+     font.size="Large"
+     font.style="BOLD|ITALIC"
+     height="16"
+     layout="topleft"
+     left="16">
+        Helvetica size=Large style=BOLD|ITALIC
+    </text>
+    <text
+     type="string"
+     length="1"
+     bottom_delta="20"
+     follows="left|top|right"
+     font="OverrideTest"
+     height="16"
+     layout="topleft"
+     left="16"
+     name="linea">
+        OverrideTest, should be times, from default/xui/en
+    </text>
+    <text
+     type="string"
+     length="1"
+     bottom_delta="20"
+     follows="left|top|right"
+     height="16"
+     layout="topleft"
+     left="16">
+        BogusFontName
+    </text>
+</floater>