From eed5671681cc508fe0f06b06018e5a14894d4f32 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Wed, 13 Mar 2019 14:21:38 +0200
Subject: SL-10610 mac fix for showing special characters

---
 indra/newview/skins/default/xui/en/fonts.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default/xui/en/fonts.xml')

diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml
index 8b1d50e58f..6ef7195ebf 100644
--- a/indra/newview/skins/default/xui/en/fonts.xml
+++ b/indra/newview/skins/default/xui/en/fonts.xml
@@ -21,6 +21,7 @@
       <file>AppleSDGothicNeo-Regular.otf</file>
       <file>华文细黑.ttf</file>
       <file>PingFang.ttc</file>
+      <file>STIXGeneral.otf</file>
     </os>
   </font>
 
-- 
cgit v1.2.3


From fd7b0e19da95bf099c1769df8c72c719c2c379f2 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Tue, 19 Mar 2019 11:16:24 +0200
Subject: SL-10610 FIXED Floaters fails to display certain symbols. Added
 ability to load font collections.

---
 indra/newview/skins/default/xui/en/fonts.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default/xui/en/fonts.xml')

diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml
index 6ef7195ebf..87c39b1024 100644
--- a/indra/newview/skins/default/xui/en/fonts.xml
+++ b/indra/newview/skins/default/xui/en/fonts.xml
@@ -10,6 +10,7 @@
       <file>simhei.ttf</file>
       <file>ArialUni.ttf</file>
       <file>msyh.ttc</file>
+      <file load_collection="true">Cambria.ttc</file>
     </os>
     <os name="Mac">
       <file>ヒラギノ角ゴシック W3.ttc</file>  
-- 
cgit v1.2.3


From 6c078137d192d62f2bbbb4713da61100990d4dec Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Fri, 19 Apr 2019 02:55:45 +0300
Subject: SL-10993 Fixed wrong Korean font in chat on Windows 10

---
 indra/newview/skins/default/xui/en/fonts.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default/xui/en/fonts.xml')

diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml
index 87c39b1024..1545867d0d 100644
--- a/indra/newview/skins/default/xui/en/fonts.xml
+++ b/indra/newview/skins/default/xui/en/fonts.xml
@@ -4,6 +4,7 @@
   <font name="default" comment="default font files (global fallbacks)">
     <file>DejaVuSans.ttf</file>
     <os name="Windows">
+      <file>MSNeoGothic.ttf</file>
       <file>meiryo.TTC</file>
       <file>MSGOTHIC.TTC</file>
       <file>gulim.ttc</file>
-- 
cgit v1.2.3


From 6faa1edf779048c6953ee91102e5c3bb0fa4e529 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Wed, 24 Jul 2019 19:01:25 +0300
Subject: SL-10993 Use the Malgun font for Korean on Windows

---
 indra/newview/skins/default/xui/en/fonts.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/fonts.xml')

diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml
index 1545867d0d..2d5263b78f 100644
--- a/indra/newview/skins/default/xui/en/fonts.xml
+++ b/indra/newview/skins/default/xui/en/fonts.xml
@@ -4,7 +4,6 @@
   <font name="default" comment="default font files (global fallbacks)">
     <file>DejaVuSans.ttf</file>
     <os name="Windows">
-      <file>MSNeoGothic.ttf</file>
       <file>meiryo.TTC</file>
       <file>MSGOTHIC.TTC</file>
       <file>gulim.ttc</file>
@@ -12,6 +11,7 @@
       <file>ArialUni.ttf</file>
       <file>msyh.ttc</file>
       <file load_collection="true">Cambria.ttc</file>
+      <file>malgun.ttf</file>
     </os>
     <os name="Mac">
       <file>ヒラギノ角ゴシック W3.ttc</file>  
-- 
cgit v1.2.3