diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-01-18 13:15:32 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-01-18 13:15:32 -0500 |
| commit | fea1d9f4d21ceccb6ebb13270c40ebbae737e769 (patch) | |
| tree | c6e4fa3a9c1f0ff39e3a65e4694b3bb891d2812e /indra/newview/skins/default/xui/en/fonts.xml | |
| parent | 5fa7f69101a889009194eeddb927599d7536613f (diff) | |
| parent | fe796dac711c7ecdc7d6d17e0b692abf468b754a (diff) | |
SL-20546: Merge branch 'DRTVWR-588-maint-W' into sl-20546.
Diffstat (limited to 'indra/newview/skins/default/xui/en/fonts.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/fonts.xml | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml index 3c3eb6b66f..1f4ff860da 100644 --- a/indra/newview/skins/default/xui/en/fonts.xml +++ b/indra/newview/skins/default/xui/en/fonts.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <fonts> <font name="default" comment="default font files (global fallbacks)"> @@ -51,19 +51,19 @@ </os> </font> - <font name="SansSerif" + <font name="SansSerif1" comment="Name of bold sans-serif font" font_style="BOLD"> <file>DejaVuSans-Bold.ttf</file> </font> - <font name="SansSerif" + <font name="SansSerif2" comment="Name of italic sans-serif font" font_style="ITALIC"> <file>DejaVuSans-Oblique.ttf</file> </font> - <font name="SansSerif" + <font name="SansSerif3" comment="Name of bold italic sans-serif font" font_style="BOLD|ITALIC"> <file>DejaVuSans-BoldOblique.ttf</file> @@ -79,19 +79,19 @@ <file>DejaVuSans.ttf</file> </font> - <font name="DejaVu" + <font name="DejaVu1" comment="Name of DejaVu font (bold)" font_style="BOLD"> <file>DejaVuSans-Bold.ttf</file> </font> - <font name="DejaVu" + <font name="DejaVu2" comment="Name of DejaVu font (italic)" font_style="ITALIC"> <file>DejaVuSans-Oblique.ttf</file> </font> - <font name="DejaVu" + <font name="DejaVu3" comment="Name of DejaVu font (bold italic)" font_style="BOLD|ITALIC"> <file>DejaVuSans-BoldOblique.ttf</file> @@ -108,7 +108,7 @@ </os> </font> - <font name="Helvetica" + <font name="Helvetica1" comment="Name of Helvetica font (bold)" font_style="BOLD"> <file>DejaVuSans-Bold.ttf</file> @@ -120,7 +120,7 @@ </os> </font> - <font name="Helvetica" + <font name="Helvetica2" comment="Name of Helvetica font (italic)" font_style="ITALIC"> <file>DejaVuSans-Oblique.ttf</file> @@ -132,7 +132,7 @@ </os> </font> - <font name="Helvetica" + <font name="Helvetica3" comment="Name of Helvetica font (bold italic)" font_style="BOLD|ITALIC"> <file>DejaVuSans-BoldOblique.ttf</file> |