Merge branch 'master' into V2Renderer

indra/newview/app_settings/settings.xml

@@ -6110,7 +6110,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>Ubuntu-R.ttf</string>
+      <string>DroidSans.ttf</string>
     </map>
     <key>FontSansSerifBundledFallback</key>
     <map>
@@ -6132,7 +6132,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>Ubuntu-B.ttf</string>
+      <string>DroidSans-Bold.ttf</string>
     </map>
     <key>FontSansSerifFallback</key>
     <map>
@@ -6154,7 +6154,7 @@
       <key>Type</key>
       <string>F32</string>
       <key>Value</key>
-      <real>0.95</real>
+      <real>1.00</real>
     </map>
     <key>FontScreenDPI</key>
     <map>
@@ -6176,7 +6176,7 @@
       <key>Type</key>
       <string>F32</string>
       <key>Value</key>
-      <real>16.0</real>
+      <real>14.0</real>
     </map>
     <key>FontSizeLarge</key>
     <map>
@@ -6187,7 +6187,7 @@
       <key>Type</key>
       <string>F32</string>
       <key>Value</key>
-      <real>11.5</real>
+      <real>11.0</real>
     </map>
     <key>FontSizeMedium</key>
     <map>