From 19b49b2e225bdc688fbae27f12b354faceb8eb51 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 10 Sep 2010 20:18:47 -0500
Subject: Made DroidSans the new default font.

---
 linden/indra/newview/app_settings/settings.xml       |  8 ++++----
 .../default/xui/en-us/panel_preferences_fonts.xml    | 20 ++++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index cbc5887..ca44a2f 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -264,7 +264,7 @@
     <key>Type</key>
     <string>String</string>
     <key>Value</key>
-    <string>DejaVu</string>
+    <string>DroidSans</string>
   </map>
   <key>GoAction</key>
   <map>
@@ -5775,7 +5775,7 @@
     <key>Type</key>
     <string>String</string>
     <key>Value</key>
-    <string>DejaVuSansCondensed.ttf</string>
+    <string>DroidSans.ttf</string>
   </map>
   <key>FontSansSerifBundledFallback</key>
   <map>
@@ -5786,7 +5786,7 @@
     <key>Type</key>
     <string>String</string>
     <key>Value</key>
-    <string>DejaVuSansCondensed.ttf</string>
+    <string>DroidSans.ttf</string>
   </map>
   <key>FontSansSerifBold</key>
   <map>
@@ -5797,7 +5797,7 @@
     <key>Type</key>
     <string>String</string>
     <key>Value</key>
-    <string>DejaVuSansCondensed-Bold.ttf</string>
+    <string>DroidSans-Bold.ttf</string>
   </map>
   <key>FontSansSerifFallback</key>
   <map>
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
index 869063f..3a27bd1 100644
--- 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
@@ -12,29 +12,29 @@
                top="-30" left="20" bottom="0" right="-20"
                follows="top|left|bottom|right">
 
-    <radio_item name="DejaVu" bottom="-20" left="0" height="20">
+    <radio_item name="DroidSans" bottom="-20" left="0" height="20">
+      Droid Sans
+    </radio_item>
+    
+    <radio_item name="DejaVu" bottom="-70" 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_item name="Delicious" bottom="-120" left="0" height="20">
       Delicious
     </radio_item>
     
-    <radio_item name="DroidSans" bottom="-170" left="0" height="20">
-      Droid Sans
+    <radio_item name="Liberation" bottom="-170" left="0" height="20">
+      Liberation Sans (classic Imprudence font)
     </radio_item>
     
   </radio_group>
 
-  <text name="dejavu_preview" font="DejaVuMedium" top="-55" left="60">
+  <text name="droid_preview" font="DroidSansMedium" 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">
+  <text name="dejavu_preview" font="DejaVuMedium" top="-105" left="60">
     Preview: The quick brown fox jumped over the lazy dog. :)
   </text>
 
@@ -42,7 +42,7 @@
     Preview: The quick brown fox jumped over the lazy dog. :)
   </text>
 
-  <text name="droid_preview" font="DroidSansMedium" top="-205" left="60">
+  <text name="lib_preview" font="LiberationMedium" top="-205" left="60">
     Preview: The quick brown fox jumped over the lazy dog. :)
   </text>
 
-- 
cgit v1.1