From 7c3fb4a1358ad619fb2aba94a16c7c371473dda6 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 24 Nov 2017 13:20:14 +0100
Subject: [PATCH] FIRE-20139: Add Tahoma as fallback font on Windows

---
 indra/newview/fonts/fonts.xml                  | 1 +
 indra/newview/fonts/fonts_deja_vu_all_caps.xml | 1 +
 indra/newview/fonts/fonts_droid.xml            | 1 +
 indra/newview/fonts/fonts_dyslexia.xml         | 1 +
 indra/newview/fonts/fonts_liberation.xml       | 1 +
 indra/newview/fonts/fonts_mobi.xml             | 1 +
 indra/newview/fonts/fonts_noto.xml             | 1 +
 indra/newview/fonts/fonts_roboto.xml           | 1 +
 indra/newview/fonts/fonts_ubuntu.xml           | 1 +
 9 files changed, 9 insertions(+)

diff --git a/indra/newview/fonts/fonts.xml b/indra/newview/fonts/fonts.xml
index 3660aba4bc..aba0ef45bd 100644
--- a/indra/newview/fonts/fonts.xml
+++ b/indra/newview/fonts/fonts.xml
@@ -11,6 +11,7 @@
       <file>ArialUni.ttf</file>
       <file>seguisym.ttf</file>
       <file>nirmala.ttf</file>
+      <file>tahoma.ttf</file>
     </os>
     <os name="Mac">
       <file>ヒラギノ角ゴシック W3.ttc</file>
diff --git a/indra/newview/fonts/fonts_deja_vu_all_caps.xml b/indra/newview/fonts/fonts_deja_vu_all_caps.xml
index ec36e22a1a..b31ec2613d 100644
--- a/indra/newview/fonts/fonts_deja_vu_all_caps.xml
+++ b/indra/newview/fonts/fonts_deja_vu_all_caps.xml
@@ -11,6 +11,7 @@
       <file>ArialUni.ttf</file>
       <file>seguisym.ttf</file>
       <file>nirmala.ttf</file>
+      <file>tahoma.ttf</file>
     </os>
     <os name="Mac">
       <file>ヒラギノ角ゴシック W3.ttc</file>
diff --git a/indra/newview/fonts/fonts_droid.xml b/indra/newview/fonts/fonts_droid.xml
index 2b2d468509..887f3d5cd7 100644
--- a/indra/newview/fonts/fonts_droid.xml
+++ b/indra/newview/fonts/fonts_droid.xml
@@ -11,6 +11,7 @@
       <file>ArialUni.ttf</file>
       <file>seguisym.ttf</file>
       <file>nirmala.ttf</file>
+      <file>tahoma.ttf</file>
     </os>
     <os name="Mac">
       <file>ヒラギノ角ゴシック W3.ttc</file>
diff --git a/indra/newview/fonts/fonts_dyslexia.xml b/indra/newview/fonts/fonts_dyslexia.xml
index 09014d889f..68fed203e3 100644
--- a/indra/newview/fonts/fonts_dyslexia.xml
+++ b/indra/newview/fonts/fonts_dyslexia.xml
@@ -11,6 +11,7 @@
       <file>ArialUni.ttf</file>
       <file>seguisym.ttf</file>
       <file>nirmala.ttf</file>
+      <file>tahoma.ttf</file>
     </os>
     <os name="Mac">
       <file>ヒラギノ角ゴシック W3.ttc</file>
diff --git a/indra/newview/fonts/fonts_liberation.xml b/indra/newview/fonts/fonts_liberation.xml
index 05eb3c67ec..e6fe4920bb 100644
--- a/indra/newview/fonts/fonts_liberation.xml
+++ b/indra/newview/fonts/fonts_liberation.xml
@@ -11,6 +11,7 @@
       <file>ArialUni.ttf</file>
       <file>seguisym.ttf</file>
       <file>nirmala.ttf</file>
+      <file>tahoma.ttf</file>
     </os>
     <os name="Mac">
       <file>ヒラギノ角ゴシック W3.ttc</file>
diff --git a/indra/newview/fonts/fonts_mobi.xml b/indra/newview/fonts/fonts_mobi.xml
index 770d46218b..c1186a4df1 100644
--- a/indra/newview/fonts/fonts_mobi.xml
+++ b/indra/newview/fonts/fonts_mobi.xml
@@ -11,6 +11,7 @@
       <file>ArialUni.ttf</file>
       <file>seguisym.ttf</file>
       <file>nirmala.ttf</file>
+      <file>tahoma.ttf</file>
     </os>
     <os name="Mac">
       <file>ヒラギノ角ゴシック W3.ttc</file>
diff --git a/indra/newview/fonts/fonts_noto.xml b/indra/newview/fonts/fonts_noto.xml
index e23fff538c..10ea624ead 100644
--- a/indra/newview/fonts/fonts_noto.xml
+++ b/indra/newview/fonts/fonts_noto.xml
@@ -11,6 +11,7 @@
       <file>ArialUni.ttf</file>
       <file>seguisym.ttf</file>
       <file>nirmala.ttf</file>
+      <file>tahoma.ttf</file>
     </os>
     <os name="Mac">
       <file>ヒラギノ角ゴシック W3.ttc</file>
diff --git a/indra/newview/fonts/fonts_roboto.xml b/indra/newview/fonts/fonts_roboto.xml
index b3e462668b..0183548fbc 100644
--- a/indra/newview/fonts/fonts_roboto.xml
+++ b/indra/newview/fonts/fonts_roboto.xml
@@ -11,6 +11,7 @@
       <file>ArialUni.ttf</file>
       <file>seguisym.ttf</file>
       <file>nirmala.ttf</file>
+      <file>tahoma.ttf</file>
     </os>
     <os name="Mac">
       <file>ヒラギノ角ゴシック W3.ttc</file>
diff --git a/indra/newview/fonts/fonts_ubuntu.xml b/indra/newview/fonts/fonts_ubuntu.xml
index 2c482e4042..70c70ec38d 100644
--- a/indra/newview/fonts/fonts_ubuntu.xml
+++ b/indra/newview/fonts/fonts_ubuntu.xml
@@ -11,6 +11,7 @@
       <file>ArialUni.ttf</file>
       <file>seguisym.ttf</file>
       <file>nirmala.ttf</file>
+      <file>tahoma.ttf</file>
     </os>
     <os name="Mac">
       <file>ヒラギノ角ゴシック W3.ttc</file>