From 5e19a58a21ce60488d8cba44ee71d22871487b3c Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 18 Jan 2024 23:31:44 +0200
Subject: [PATCH] Fix broken fonts
partial revert of 06c2c87bfaf364cb358b8a4b194e6369531a63c6
---
indra/newview/skins/default/xui/en/fonts.xml | 18 +++++++++---------
1 file 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 1f4ff860dad..567dd850907 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>
--
GitLab