From 31b72e6bf43dca5786bf8145d8f8d9f07c14ca44 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Fri, 19 Mar 2021 19:54:10 +0100
Subject: [PATCH] FIRE-30852: Add Deja Vu Sans as fallback font for Linux

---
 indra/newview/fonts/fonts.xml                       | 3 +++
 indra/newview/fonts/fonts_celestia_medium_redux.xml | 3 +++
 indra/newview/fonts/fonts_deja_vu_all_caps.xml      | 3 +++
 indra/newview/fonts/fonts_droid.xml                 | 3 +++
 indra/newview/fonts/fonts_dyslexia.xml              | 3 +++
 indra/newview/fonts/fonts_liberation.xml            | 3 +++
 indra/newview/fonts/fonts_mobi.xml                  | 3 +++
 indra/newview/fonts/fonts_noto.xml                  | 3 +++
 indra/newview/fonts/fonts_roboto.xml                | 3 +++
 indra/newview/fonts/fonts_ubuntu.xml                | 3 +++
 10 files changed, 30 insertions(+)

diff --git a/indra/newview/fonts/fonts.xml b/indra/newview/fonts/fonts.xml
index 00ce0e8b17..63b3bfe38a 100644
--- a/indra/newview/fonts/fonts.xml
+++ b/indra/newview/fonts/fonts.xml
@@ -32,6 +32,9 @@
       <file>STIXGeneral.otf</file>
       <file>Thonburi.ttc</file>
     </os>
+    <os name="Linux">
+      <file>DejaVuSans.ttf</file>
+    </os>
   </font>
 
   <font name="SansSerifBold"
diff --git a/indra/newview/fonts/fonts_celestia_medium_redux.xml b/indra/newview/fonts/fonts_celestia_medium_redux.xml
index d177a69a56..c0245ddc5e 100644
--- a/indra/newview/fonts/fonts_celestia_medium_redux.xml
+++ b/indra/newview/fonts/fonts_celestia_medium_redux.xml
@@ -32,6 +32,9 @@
       <file>STIXGeneral.otf</file>
       <file>Thonburi.ttc</file>
     </os>
+    <os name="Linux">
+      <file>DejaVuSans.ttf</file>
+    </os>
   </font>
 
   <font name="SansSerifBold"
diff --git a/indra/newview/fonts/fonts_deja_vu_all_caps.xml b/indra/newview/fonts/fonts_deja_vu_all_caps.xml
index 3210a539a4..ccb2e1be59 100644
--- a/indra/newview/fonts/fonts_deja_vu_all_caps.xml
+++ b/indra/newview/fonts/fonts_deja_vu_all_caps.xml
@@ -30,6 +30,9 @@
       <file>PingFang.ttc</file>
       <file>STIXGeneral.otf</file>
     </os>
+    <os name="Linux">
+      <file>DejaVuSans.ttf</file>
+    </os>
   </font>
 
   <font name="SansSerifBold"
diff --git a/indra/newview/fonts/fonts_droid.xml b/indra/newview/fonts/fonts_droid.xml
index c540333cbe..a7f9e1b1b9 100644
--- a/indra/newview/fonts/fonts_droid.xml
+++ b/indra/newview/fonts/fonts_droid.xml
@@ -32,6 +32,9 @@
       <file>STIXGeneral.otf</file>
       <file>Thonburi.ttc</file>
     </os>
+    <os name="Linux">
+      <file>DejaVuSans.ttf</file>
+    </os>
   </font>
 
   <font name="SansSerifBold"
diff --git a/indra/newview/fonts/fonts_dyslexia.xml b/indra/newview/fonts/fonts_dyslexia.xml
index ce40f41f94..5a64a3ab8a 100644
--- a/indra/newview/fonts/fonts_dyslexia.xml
+++ b/indra/newview/fonts/fonts_dyslexia.xml
@@ -32,6 +32,9 @@
       <file>STIXGeneral.otf</file>
       <file>Thonburi.ttc</file>
     </os>
+    <os name="Linux">
+      <file>DejaVuSans.ttf</file>
+    </os>
   </font>
 
   <font name="SansSerifBold"
diff --git a/indra/newview/fonts/fonts_liberation.xml b/indra/newview/fonts/fonts_liberation.xml
index 0685fe5e61..eb21cfe8ea 100644
--- a/indra/newview/fonts/fonts_liberation.xml
+++ b/indra/newview/fonts/fonts_liberation.xml
@@ -32,6 +32,9 @@
       <file>STIXGeneral.otf</file>
       <file>Thonburi.ttc</file>
     </os>
+    <os name="Linux">
+      <file>DejaVuSans.ttf</file>
+    </os>
   </font>
 
   <font name="SansSerifBold"
diff --git a/indra/newview/fonts/fonts_mobi.xml b/indra/newview/fonts/fonts_mobi.xml
index 76e08ece60..345fa9bc8b 100644
--- a/indra/newview/fonts/fonts_mobi.xml
+++ b/indra/newview/fonts/fonts_mobi.xml
@@ -32,6 +32,9 @@
       <file>STIXGeneral.otf</file>
       <file>Thonburi.ttc</file>
     </os>
+    <os name="Linux">
+      <file>DejaVuSans.ttf</file>
+    </os>
   </font>
 
   <font name="SansSerifBold"
diff --git a/indra/newview/fonts/fonts_noto.xml b/indra/newview/fonts/fonts_noto.xml
index 08c4fbf813..9b8df0adf6 100644
--- a/indra/newview/fonts/fonts_noto.xml
+++ b/indra/newview/fonts/fonts_noto.xml
@@ -32,6 +32,9 @@
       <file>STIXGeneral.otf</file>
       <file>Thonburi.ttc</file>
     </os>
+    <os name="Linux">
+      <file>DejaVuSans.ttf</file>
+    </os>
   </font>
 
   <font name="SansSerifBold"
diff --git a/indra/newview/fonts/fonts_roboto.xml b/indra/newview/fonts/fonts_roboto.xml
index 004061a1b9..6d40a53838 100644
--- a/indra/newview/fonts/fonts_roboto.xml
+++ b/indra/newview/fonts/fonts_roboto.xml
@@ -32,6 +32,9 @@
       <file>STIXGeneral.otf</file>
       <file>Thonburi.ttc</file>
     </os>
+    <os name="Linux">
+      <file>DejaVuSans.ttf</file>
+    </os>
   </font>
 
   <font name="SansSerifBold"
diff --git a/indra/newview/fonts/fonts_ubuntu.xml b/indra/newview/fonts/fonts_ubuntu.xml
index 5246683517..f558f5cfe3 100644
--- a/indra/newview/fonts/fonts_ubuntu.xml
+++ b/indra/newview/fonts/fonts_ubuntu.xml
@@ -32,6 +32,9 @@
       <file>STIXGeneral.otf</file>
       <file>Thonburi.ttc</file>
     </os>
+    <os name="Linux">
+      <file>DejaVuSans.ttf</file>
+    </os>
   </font>
 
   <font name="SansSerifBold"