diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-01-18 21:25:35 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-01-18 21:25:35 -0500 |
| commit | e8fc7a61a159fc307e55849f2d27fca4e1e36a0d (patch) | |
| tree | a62696ccc1b84c8de80272fd969b17e92ef88755 /indra/newview | |
| parent | b156dd92957bc5ba123f69781bbe538cdc3a06c7 (diff) | |
| parent | 5e19a58a21ce60488d8cba44ee71d22871487b3c (diff) | |
Merge branch 'DRTVWR-588-maint-W' into sl-20546.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/skins/default/xui/en/fonts.xml | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml index 1f4ff860da..567dd85090 100644 --- a/indra/newview/skins/default/xui/en/fonts.xml +++ b/indra/newview/skins/default/xui/en/fonts.xml @@ -51,19 +51,19 @@ </os> </font> - <font name="SansSerif1" + <font name="SansSerif" comment="Name of bold sans-serif font" font_style="BOLD"> <file>DejaVuSans-Bold.ttf</file> </font> - <font name="SansSerif2" + <font name="SansSerif" comment="Name of italic sans-serif font" font_style="ITALIC"> <file>DejaVuSans-Oblique.ttf</file> </font> - <font name="SansSerif3" + <font name="SansSerif" 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="DejaVu1" + <font name="DejaVu" comment="Name of DejaVu font (bold)" font_style="BOLD"> <file>DejaVuSans-Bold.ttf</file> </font> - <font name="DejaVu2" + <font name="DejaVu" comment="Name of DejaVu font (italic)" font_style="ITALIC"> <file>DejaVuSans-Oblique.ttf</file> </font> - <font name="DejaVu3" + <font name="DejaVu" comment="Name of DejaVu font (bold italic)" font_style="BOLD|ITALIC"> <file>DejaVuSans-BoldOblique.ttf</file> @@ -108,7 +108,7 @@ </os> </font> - <font name="Helvetica1" + <font name="Helvetica" comment="Name of Helvetica font (bold)" font_style="BOLD"> <file>DejaVuSans-Bold.ttf</file> @@ -120,7 +120,7 @@ </os> </font> - <font name="Helvetica2" + <font name="Helvetica" comment="Name of Helvetica font (italic)" font_style="ITALIC"> <file>DejaVuSans-Oblique.ttf</file> @@ -132,7 +132,7 @@ </os> </font> - <font name="Helvetica3" + <font name="Helvetica" comment="Name of Helvetica font (bold italic)" font_style="BOLD|ITALIC"> <file>DejaVuSans-BoldOblique.ttf</file> |