diff options
| author | Callum Linden <113564339+callumlinden@users.noreply.github.com> | 2023-03-07 11:46:27 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-07 11:46:27 -0800 |
| commit | 6b0b751a207737c06544ac4de13174661b1dcb35 (patch) | |
| tree | 95f472eabe4407cca653af3a867808f32402551c /indra/newview/skins/default/xui/en/fonts.xml | |
| parent | 98f0656f5c21a9469984cc8c916a1310d2fc2849 (diff) | |
| parent | 4072fd84fb201e37827a6a98264fadea18fd30e4 (diff) | |
Merge pull request #83 from KittyBarnett/DRTVWR-489-emoji
Drtvwr 489 emoji
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 d88c267a95..40045625fd 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> |