Added Preferences > Fonts tab, with basic font chooser.

Choosing a font sets FontChoice setting, but no real effect yet.

3 files changed, 54 insertions, 0 deletions

diff --git a/linden/indra/newview/skins/default/xui/en-us/fonts.xml b/linden/indra/newview/skins/default/xui/en-us/fonts.xml
index 95070ed..5d831c6 100644
--- a/linden/indra/newview/skins/default/xui/en-us/fonts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/fonts.xml
@@ -33,6 +33,7 @@
     <file>VeraMono.ttf</file>
   </font>
 
+
   <font name="DejaVu"
         comment="Name of DejaVu font">
     <file>DejaVuSansCondensed.ttf</file>
@@ -56,6 +57,19 @@
     <file>DejaVuSansCondensed-BoldOblique.ttf</file>
   </font>
 
+
+  <font name="Liberation"
+        comment="Name of Liberation font">
+    <file>LiberationSans-Regular.ttf</file>
+  </font>
+
+  <font name="Liberation"
+        comment="Name of Liberation font (bold)"
+        font_style="BOLD">
+    <file>LiberationSans-Bold.ttf</file>
+  </font>
+
+
   <font name="Helvetica"
         comment="Name of Helvetica font">
     <file>arial.ttf</file>
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index 0de1df5..eced647 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -7084,6 +7084,13 @@ Apply this region's settings? (&quot;Ignore&quot; will ignore all region setting
   </form>
 </notification>
 
+<notification
+ name="ChangeFont"
+ icon="alertmodal.tga"
+ type="alertmodal">
+The new font will appear after you restart [VIEWER_NAME].
+</notification>
+
 
 <!--End Imprudence notifications-->
  <!-- [KITTY VIEWER] -->
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_fonts.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_fonts.xml
new file mode 100644
index 0000000..e55981b
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_fonts.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<panel name="font_panel" label="Fonts"
+       bottom="-409" left="102" height="408" width="517"
+       border="true" follows="left|top|right|bottom">
+
+  <text bottom="-25" left="10" height="15" width="300">
+    User interface font (requires restart):
+  </text>
+
+  <radio_group name="fonts" draw_border="false"
+               top="-30" left="20" bottom="0" right="-20"
+               follows="top|left|bottom|right">
+
+    <radio_item name="DejaVu" bottom="-20" left="0" height="20">
+      DejaVu Sans Condensed
+    </radio_item>
+
+    <radio_item name="Liberation" bottom="-70" left="0" height="20">
+      Liberation Sans (classic Imprudence font)
+    </radio_item>
+    
+  </radio_group>
+
+  <text name="dejavu_preview" font="DejaVuMedium" top="-55" left="60">
+    Preview: The quick brown fox jumped over the lazy dog. :)
+  </text>
+
+  <text name="lib_preview" font="LiberationMedium" top="-105" left="60">
+    Preview: The quick brown fox jumped over the lazy dog. :)
+  </text>
+
+</panel>