change default font to SansSerifSmall

20 files changed, 16 insertions, 48 deletions

diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp
index b2ca9cce75..5d99c35047 100644
--- a/indra/llrender/llfontgl.cpp
+++ b/indra/llrender/llfontgl.cpp
@@ -1115,7 +1115,14 @@ LLFontGL* LLFontGL::getFontSansSerifSmallItalic()
 //static
 LLFontGL* LLFontGL::getFontSansSerif()
 {
-    static LLFontGL* fontp = getFont(LLFontDescriptor("SansSerif","Medium",0));
+    static LLFontGL* fontp = getFont(LLFontDescriptor("SansSerif","Small",0));
+    return fontp;
+}
+
+// static
+LLFontGL* LLFontGL::getFontSansSerifMedium()
+{
+    static LLFontGL* fontp = getFont(LLFontDescriptor("SansSerif", "Medium", 0));
     return fontp;
 }
 
diff --git a/indra/llrender/llfontgl.h b/indra/llrender/llfontgl.h
index 7743d61e40..3b82d8e43d 100644
--- a/indra/llrender/llfontgl.h
+++ b/indra/llrender/llfontgl.h
@@ -204,6 +204,7 @@ public:
     static LLFontGL* getFontSansSerifSmallBold();
     static LLFontGL* getFontSansSerifSmallItalic();
     static LLFontGL* getFontSansSerif();
+    static LLFontGL* getFontSansSerifMedium();
     static LLFontGL* getFontSansSerifBig();
     static LLFontGL* getFontSansSerifHuge();
     static LLFontGL* getFontSansSerifBold();
diff --git a/indra/llrender/llfontregistry.cpp b/indra/llrender/llfontregistry.cpp
index a107b263d8..890308ab54 100644
--- a/indra/llrender/llfontregistry.cpp
+++ b/indra/llrender/llfontregistry.cpp
@@ -170,7 +170,7 @@ LLFontDescriptor LLFontDescriptor::normalize() const
     if (new_size != s_template_string && new_size.empty() && findSubString(new_name,"Monospace"))
         new_size = "Monospace";
     if (new_size.empty())
-        new_size = "Medium";
+        new_size = "Small";
 
     if (removeSubString(new_name,"Bold"))
         new_style |= LLFontGL::BOLD;
diff --git a/indra/llui/lluictrl.cpp b/indra/llui/lluictrl.cpp
index 05461edd82..9a27049d37 100644
--- a/indra/llui/lluictrl.cpp
+++ b/indra/llui/lluictrl.cpp
@@ -80,7 +80,7 @@ LLUICtrl::Params::Params()
     mouseenter_callback("mouseenter_callback"),
     mouseleave_callback("mouseleave_callback"),
     control_name("control_name"),
-    font("font", LLFontGL::getFontEmojiMedium()),
+    font("font", LLFontGL::getFontEmojiSmall()),
     font_halign("halign"),
     font_valign("valign"),
     length("length"),   // ignore LLXMLNode cruft
diff --git a/indra/newview/llviewerchat.cpp b/indra/newview/llviewerchat.cpp
index 2ca2c5c07d..a9aa63e68f 100644
--- a/indra/newview/llviewerchat.cpp
+++ b/indra/newview/llviewerchat.cpp
@@ -200,7 +200,7 @@ LLFontGL* LLViewerChat::getChatFont()
             break;
         default:
         case 1:
-            fontp = LLFontGL::getFontSansSerif();
+            fontp = LLFontGL::getFontSansSerifMedium();
             break;
         case 2:
             fontp = LLFontGL::getFontSansSerifBig();
diff --git a/indra/newview/skins/default/xui/en/floater_add_payment_method.xml b/indra/newview/skins/default/xui/en/floater_add_payment_method.xml
index 8538c255bf..308f4feb5a 100644
--- a/indra/newview/skins/default/xui/en/floater_add_payment_method.xml
+++ b/indra/newview/skins/default/xui/en/floater_add_payment_method.xml
@@ -50,7 +50,6 @@
      follows="top|left|right"
      height="24"
      label="Get started"
-     font="SansSerifMedium"
      layout="topleft"
      left="320"
      name="continue_btn"
@@ -99,7 +98,6 @@
      type="string"
      length="1"
      follows="top|left"
-     font="SansSerifMedium"
      text_color="White"
      height="75"
      width="260"
@@ -114,7 +112,6 @@
      type="string"
      length="1"
      follows="top|left"
-     font="SansSerifMedium"
      text_color="White"
      height="75"
      width="260"
@@ -128,7 +125,6 @@
      type="string"
      length="1"
      follows="top|left"
-     font="SansSerifMedium"
      text_color="White"
      height="75"
      width="260"
diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency.xml b/indra/newview/skins/default/xui/en/floater_buy_currency.xml
index e8e83301be..5e0903a40f 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_currency.xml
@@ -93,7 +93,6 @@
        type="string"
        length="1"
        follows="top|left"
-       font="SansSerifMedium"
        height="16"
        layout="topleft"
        left="20"
@@ -105,7 +104,6 @@
       <text
        type="string"
        length="1"
-       font="SansSerifMedium"
        follows="top|left"
        halign="right"
        height="16"
@@ -128,7 +126,6 @@
        type="string"
        length="1"
        follows="top|left"
-       font="SansSerifMedium"
        height="16"
        layout="topleft"
        left="20"
@@ -140,7 +137,6 @@
       <text
        type="string"
        length="1"
-       font="SansSerifMedium"
        follows="top|left"
        halign="right"
        height="16"
@@ -163,7 +159,6 @@
         type="string"
         length="1"
         follows="top|left"
-        font="SansSerifMedium"
         font.style="BOLD"
         height="16"
         layout="topleft"
@@ -176,7 +171,6 @@
       <text
        type="string"
        length="1"
-       font="SansSerifMedium"
        follows="top|left"
        halign="right"
        height="16"
@@ -207,7 +201,6 @@
        type="string"
        length="1"
        follows="top|left"
-       font="SansSerifMedium"
        height="16"
        top_pad="15"
        layout="topleft"
@@ -217,7 +210,6 @@
           Choose amount to buy
       </text>
       <text
-       font="SansSerifMedium"
        type="string"
        length="1"
        follows="left|top"
@@ -233,7 +225,6 @@
        type="string"
        max_length_bytes="10"
        halign="right"
-       font="SansSerifMedium"
        select_on_focus="true"
        follows="top|left"
        top_delta="-4"
@@ -247,7 +238,6 @@
       <text
        type="string"
        length="1"
-       font="SansSerifMedium"
        text_color="EmphasisColor"
        follows="top|left"
        halign="right"
@@ -276,7 +266,6 @@
       </text>
       <text
        type="string"
-       font="SansSerifMedium"
        length="1"
        follows="top|left"
        height="16"
@@ -290,7 +279,6 @@
       <text
        type="string"
        length="1"
-       font="SansSerifMedium"
        follows="top|left"
        top_delta="0"
        height="16"
@@ -350,7 +338,6 @@ Re-enter amount to see the latest exchange rate.
        length="1"
        follows="top|left"
        layout="topleft"
-       font="SansSerifMedium"
        top="10"
        left="20"
        width="310"
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_settings.xml b/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
index 9d2ed43756..5dd3dfa2bf 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
@@ -27,7 +27,6 @@
    left_pad="12"
    top_delta="2"
    name="multi_folder_txt"
-   font="SansSerifMedium"
    text_color="White"
    width="300">
    Double-click on folder in multi-folder view:
@@ -37,7 +36,6 @@
   follows="left|top"
   top_pad="8"
   layout="topleft"
-  font="SansSerifMedium"
   left="60"
   width="300"
   height="66"
@@ -90,7 +88,6 @@
    left_pad="12"
    top_delta="2"
    name="single_folder_txt"
-   font="SansSerifMedium"
    text_color="White"
    width="300">
    Double-click on folder in single-folder view:
@@ -100,7 +97,6 @@
   follows="left|top"
   top_pad="8"
   layout="topleft"
-  font="SansSerifMedium"
   left="60"
   width="300"
   height="44"
@@ -142,7 +138,6 @@
    layout="topleft"
    left_pad="13"
    name="find_original_txt"
-   font="SansSerifMedium"
    text_color="White"
    top_delta="1"
    width="310">
@@ -153,7 +148,6 @@
   follows="left|top"
   top_pad="8"
   layout="topleft"
-  font="SansSerifMedium"
   left="60"
   width="300"
   height="44"
@@ -196,7 +190,6 @@
    left_pad="12"
    top_delta="2"
    name="favorites_txt"
-   font="SansSerifMedium"
    text_color="White"
    width="300">
    Favorites
@@ -206,7 +199,6 @@
    layout="topleft"
    follows="left|top"
    top_pad="8"
-   font="SansSerifMedium"
    left="60"
    width="300"
    height="18"
@@ -219,7 +211,6 @@
    follows="left|top"
    top_pad="5"
    layout="topleft"
-   font="SansSerifMedium"
    left="60"
    width="150"
    height="18"
@@ -232,7 +223,6 @@
    follows="left|top"
    top_pad="5"
    layout="topleft"
-   font="SansSerifMedium"
    left="60"
    width="150"
    height="18"
@@ -276,7 +266,6 @@
    left_pad="12"
    top_delta="2"
    name="single_folder_txt"
-   font="SansSerifMedium"
    text_color="White"
    width="300">
    Pressing enter on an avatar attachment
diff --git a/indra/newview/skins/default/xui/en/floater_test_slapp.xml b/indra/newview/skins/default/xui/en/floater_test_slapp.xml
index 5a13a0147e..35f5961285 100644
--- a/indra/newview/skins/default/xui/en/floater_test_slapp.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_slapp.xml
@@ -17,7 +17,6 @@
     follows="left|top|right"
     height="16"
     name="trusted_txt"
-    font="SansSerifMedium"
     text_color="white"
     layout="topleft"
     left="16">
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 023df69f0f..e736fc58b2 100644
--- a/indra/newview/skins/default/xui/en/floater_test_textbox.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_textbox.xml
@@ -99,7 +99,7 @@
  font.name="SansSerifSmall"
  name="test_text10"
  tool_tip="text">
-    SansSerifSmall
+    SansSerif
     The 华文细黑 brown fox ヒラキjumped over the lazy dog.
   </text>
   <text
@@ -111,7 +111,7 @@
    font.name="SansSerifMedium"
    name="test_text11"
    tool_tip="text">
-    SansSerif
+    SansSerifMedium
     The 华文细黑 brown fox ヒラキjumped over the lazy dog.
   </text>
   <text
diff --git a/indra/newview/skins/default/xui/en/floater_toybox.xml b/indra/newview/skins/default/xui/en/floater_toybox.xml
index 718569bf34..d75d2e0db7 100644
--- a/indra/newview/skins/default/xui/en/floater_toybox.xml
+++ b/indra/newview/skins/default/xui/en/floater_toybox.xml
@@ -16,7 +16,6 @@
   width="650">
   <text
     follows="left|top"
-    font="SansSerifMedium"
     valign="top"
     halign="left"
     height="20"
@@ -31,7 +30,6 @@
   </text>
   <text
     follows="left|top"
-    font="SansSerifMedium"
     valign="top"
     halign="left"
     height="20"
diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml
index 6012be8bed..3c6e100541 100644
--- a/indra/newview/skins/default/xui/en/fonts.xml
+++ b/indra/newview/skins/default/xui/en/fonts.xml
@@ -194,7 +194,7 @@
          />
   <font_size name="Medium"
          comment="Size of medium font (points, or 1/72 of an inch)"
-         size="9"
+         size="10"
          />
   <font_size name="Small"
          comment="Size of small font (points, or 1/72 of an inch)"
diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml
index 74bc7736f9..260dc02ae3 100644
--- a/indra/newview/skins/default/xui/en/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_general.xml
@@ -64,8 +64,7 @@ Hover your mouse over the options for more help.
      use_ellipses="true"
      width="168" />
     <text
-    font="SansSerifMedium"
-    text_color="white"
+     text_color="white"
      type="string"
      follows="left|top"
      height="16"
diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml
index b1d5086a29..2ecc4585ba 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml
@@ -276,7 +276,6 @@ Maximum 200 per group daily
     width="313">
         <text
          type="string"
-         font="SansSerifMedium"
          height="16"
          layout="topleft"
          left="10"
diff --git a/indra/newview/skins/default/xui/en/panel_hint.xml b/indra/newview/skins/default/xui/en/panel_hint.xml
index 7442136761..741ed5af41 100644
--- a/indra/newview/skins/default/xui/en/panel_hint.xml
+++ b/indra/newview/skins/default/xui/en/panel_hint.xml
@@ -3,7 +3,6 @@
  width="205"
  height="34">
   <text name="hint_title"
-        font="SansSerifMedium" 
         left="8"
         right="180"
         top="8"
diff --git a/indra/newview/skins/default/xui/en/panel_hint_image.xml b/indra/newview/skins/default/xui/en/panel_hint_image.xml
index d712245df8..3e3205531f 100644
--- a/indra/newview/skins/default/xui/en/panel_hint_image.xml
+++ b/indra/newview/skins/default/xui/en/panel_hint_image.xml
@@ -4,7 +4,6 @@
  height="40"
  layout="topleft">
   <text name="hint_title"
-        font="SansSerifMedium" 
         left="8"
         right="290"
         top="8"
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 6e1e6facbe..a302d44e83 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -34,7 +34,6 @@
   	 left="12"
   	 right="-12"
      name="ItemcountText"
-     font="SansSerifMedium"
      text_color="InventoryItemLinkColor"
      use_ellipses="true"
      top_pad="0">
diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
index 61cd6a83d4..371147b28a 100644
--- a/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
@@ -108,7 +108,6 @@
           left="2"
           width="306"
           halign="center"
-          font="SansSerifMedium"
           font_shadow="hard"
           valign="top">
           Drop folders here to create new listings
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index de47e05291..3fc22d69ca 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -69,7 +69,6 @@
                      <button
                         control_name="InventoryInboxToggleState"
                         label="Received items"
-                        font="SansSerifMedium"
                         name="inbox_btn"
                         height="35"
                         image_unselected="MarketplaceBtn_Off"
@@ -92,7 +91,6 @@
                         top="10"
                         right="-20"
                         name="inbox_fresh_new_count"
-                        font="SansSerifMedium"
                         halign="right"
                         top_pad="0">
                         [NUM] new
diff --git a/indra/newview/skins/default/xui/en/widgets/panel_camera_item.xml b/indra/newview/skins/default/xui/en/widgets/panel_camera_item.xml
index ea49b750d1..6824080b49 100644
--- a/indra/newview/skins/default/xui/en/widgets/panel_camera_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/panel_camera_item.xml
@@ -55,7 +55,6 @@
      width="30" />
   <panel_camera_item.text
    follows="top|left|right"
-     font="SansSerifMedium"
      height="15"
      layout="topleft"
      left ="38"