diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-03-01 17:30:06 +0200 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-03-01 17:30:06 +0200 |
commit | 6d077c90a01121e1d11c7a4c8e3867cebf937e0d (patch) | |
tree | 660b4107afc57b4885769c920d9697e72ff41931 /indra/newview/skins/default/xui/en/fonts.xml | |
parent | b42e01d7acf5d4c55612c3a7df0e1ff6ee5ed951 (diff) | |
parent | 701d1a33bb8227aa55a71f48caeb30a453e77ee0 (diff) |
Merge branch 'main' into DRTVWR-588-maint-W
Diffstat (limited to 'indra/newview/skins/default/xui/en/fonts.xml')
-rw-r--r-- | indra/newview/skins/default/xui/en/fonts.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml index 567dd85090..45ec1e27f1 100644 --- a/indra/newview/skins/default/xui/en/fonts.xml +++ b/indra/newview/skins/default/xui/en/fonts.xml @@ -3,6 +3,7 @@ <font name="default" comment="default font files (global fallbacks)"> <file>DejaVuSans.ttf</file> + <file functor="is_emoji">TwemojiSVG.ttf</file> <os name="Windows"> <file>meiryo.TTC</file> <file>MSGOTHIC.TTC</file> @@ -69,6 +70,11 @@ <file>DejaVuSans-BoldOblique.ttf</file> </font> + <font name="Emoji" + comment="Name of emoji font"> + <file>TwemojiSVG.ttf</file> + </font> + <font name="Monospace" comment="Name of monospace font"> <file>DejaVuSansMono.ttf</file> |