diff --git a/autobuild.xml b/autobuild.xml index a566e8cf64706370bc931ce3ca07e724172576a1..84e0fd03263b1cd2da739cdc5bd194271001b850 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -696,11 +696,11 @@ <key>archive</key> <map> <key>hash</key> - <string>540c22da6b191c63b9488296034b429948d87f693ba37a8b13080ad9229136808bcd63653bb58d49b733cf2296fb3aca2cd52a1f582f37da763d50537c23486b</string> + <string>d8e58016074727c9b4fffb8623035adac7dda2933f61e03998cac1d75e80a2da4ece61f9222bdc589e3be10154e80beda4eb7d4ff8a3b2aab4736350d27098e0</string> <key>hash_algorithm</key> <string>blake2b</string> <key>url</key> - <string>https://git.alchemyviewer.org/api/v4/projects/169/packages/generic/fonts/76a6399.2390/fonts-76a6399-common-2390.tar.zst</string> + <string>https://git.alchemyviewer.org/api/v4/projects/169/packages/generic/fonts/427d30e.2397/fonts-427d30e-common-2397.tar.zst</string> </map> <key>name</key> <string>common</string> @@ -713,7 +713,7 @@ <key>copyright</key> <string>Various Licenses</string> <key>version</key> - <string>76a6399</string> + <string>427d30e</string> <key>name</key> <string>fonts</string> <key>canonical_repo</key> diff --git a/indra/newview/skins/default/xui/en/font_main_ibmplex.xml b/indra/newview/skins/default/xui/en/font_main_ibmplex.xml index ff8ddc82e3ec1b0a10c38d777068d9b1385d9f21..fb1ccd8f7fedb04f147c8f4f4bfb0220d39ad996 100644 --- a/indra/newview/skins/default/xui/en/font_main_ibmplex.xml +++ b/indra/newview/skins/default/xui/en/font_main_ibmplex.xml @@ -1,45 +1,45 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <fonts> <font name="default"> - <file>IBMPlexSans-Regular.ttf</file> - <file>IBMPlexSansJP-Regular.ttf</file> - <file>IBMPlexSansKR-Regular.ttf</file> - <file>IBMPlexSansThai-Regular.ttf</file> - <file>IBMPlexSansHebrew-Regular.ttf</file> - <file>IBMPlexSansDevanagari-Regular.ttf</file> - <file>IBMPlexSansArabic-Regular.ttf</file> + <file>IBMPlexSans-Regular.otf</file> + <file>IBMPlexSansJP-Regular.otf</file> + <file>IBMPlexSansKR-Regular.otf</file> + <file>IBMPlexSansThai-Regular.otf</file> + <file>IBMPlexSansHebrew-Regular.otf</file> + <file>IBMPlexSansDevanagari-Regular.otf</file> + <file>IBMPlexSansArabic-Regular.otf</file> </font> <font name="SansSerif"> - <file>IBMPlexSans-Regular.ttf</file> - <file>IBMPlexSansJP-Regular.ttf</file> - <file>IBMPlexSansKR-Regular.ttf</file> - <file>IBMPlexSansThai-Regular.ttf</file> - <file>IBMPlexSansHebrew-Regular.ttf</file> - <file>IBMPlexSansDevanagari-Regular.ttf</file> - <file>IBMPlexSansArabic-Regular.ttf</file> + <file>IBMPlexSans-Regular.otf</file> + <file>IBMPlexSansJP-Regular.otf</file> + <file>IBMPlexSansKR-Regular.otf</file> + <file>IBMPlexSansThai-Regular.otf</file> + <file>IBMPlexSansHebrew-Regular.otf</file> + <file>IBMPlexSansDevanagari-Regular.otf</file> + <file>IBMPlexSansArabic-Regular.otf</file> </font> <font name="SansSerif" font_style="BOLD"> - <file>IBMPlexSans-Bold.ttf</file> - <file>IBMPlexSansJP-Bold.ttf</file> - <file>IBMPlexSansKR-Bold.ttf</file> - <file>IBMPlexSansThai-Bold.ttf</file> - <file>IBMPlexSansHebrew-Bold.ttf</file> - <file>IBMPlexSansDevanagari-Bold.ttf</file> - <file>IBMPlexSansArabic-Bold.ttf</file> + <file>IBMPlexSans-Bold.otf</file> + <file>IBMPlexSansJP-Bold.otf</file> + <file>IBMPlexSansKR-Bold.otf</file> + <file>IBMPlexSansThai-Bold.otf</file> + <file>IBMPlexSansHebrew-Bold.otf</file> + <file>IBMPlexSansDevanagari-Bold.otf</file> + <file>IBMPlexSansArabic-Bold.otf</file> </font> <font name="SansSerif" font_style="ITALIC"> - <file>IBMPlexSans-Italic.ttf</file> + <file>IBMPlexSans-Italic.otf</file> </font> <font name="SansSerif" font_style="BOLD|ITALIC"> - <file>IBMPlexSans-BoldItalic.ttf</file> + <file>IBMPlexSans-BoldItalic.otf</file> </font> <font name="OverrideTest"> - <file>IBMPlexSans-Regular.ttf</file> + <file>IBMPlexSans-Regular.otf</file> </font> <font_size name="Huge" size="16.0" /> diff --git a/indra/newview/skins/default/xui/en/font_main_ibmplexmono.xml b/indra/newview/skins/default/xui/en/font_main_ibmplexmono.xml index c4a5808a5dd3b3169ab9e3615998abe9b5b360a2..072192158d07e66a0588bc49cd0488e5b996b4be 100644 --- a/indra/newview/skins/default/xui/en/font_main_ibmplexmono.xml +++ b/indra/newview/skins/default/xui/en/font_main_ibmplexmono.xml @@ -1,45 +1,45 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <fonts> <font name="default"> - <file>IBMPlexMono-Regular.ttf</file> - <file>IBMPlexSansJP-Regular.ttf</file> - <file>IBMPlexSansKR-Regular.ttf</file> - <file>IBMPlexSansThai-Regular.ttf</file> - <file>IBMPlexSansHebrew-Regular.ttf</file> - <file>IBMPlexSansDevanagari-Regular.ttf</file> - <file>IBMPlexSansArabic-Regular.ttf</file> + <file>IBMPlexMono-Regular.otf</file> + <file>IBMPlexSansJP-Regular.otf</file> + <file>IBMPlexSansKR-Regular.otf</file> + <file>IBMPlexSansThai-Regular.otf</file> + <file>IBMPlexSansHebrew-Regular.otf</file> + <file>IBMPlexSansDevanagari-Regular.otf</file> + <file>IBMPlexSansArabic-Regular.otf</file> </font> <font name="SansSerif"> - <file>IBMPlexMono-Regular.ttf</file> - <file>IBMPlexSansJP-Regular.ttf</file> - <file>IBMPlexSansKR-Regular.ttf</file> - <file>IBMPlexSansThai-Regular.ttf</file> - <file>IBMPlexSansHebrew-Regular.ttf</file> - <file>IBMPlexSansDevanagari-Regular.ttf</file> - <file>IBMPlexSansArabic-Regular.ttf</file> + <file>IBMPlexMono-Regular.otf</file> + <file>IBMPlexSansJP-Regular.otf</file> + <file>IBMPlexSansKR-Regular.otf</file> + <file>IBMPlexSansThai-Regular.otf</file> + <file>IBMPlexSansHebrew-Regular.otf</file> + <file>IBMPlexSansDevanagari-Regular.otf</file> + <file>IBMPlexSansArabic-Regular.otf</file> </font> <font name="SansSerif" font_style="BOLD"> - <file>IBMPlexMono-Bold.ttf</file> - <file>IBMPlexSansJP-Bold.ttf</file> - <file>IBMPlexSansKR-Bold.ttf</file> - <file>IBMPlexSansThai-Bold.ttf</file> - <file>IBMPlexSansHebrew-Bold.ttf</file> - <file>IBMPlexSansDevanagari-Bold.ttf</file> - <file>IBMPlexSansArabic-Bold.ttf</file> + <file>IBMPlexMono-Bold.otf</file> + <file>IBMPlexSansJP-Bold.otf</file> + <file>IBMPlexSansKR-Bold.otf</file> + <file>IBMPlexSansThai-Bold.otf</file> + <file>IBMPlexSansHebrew-Bold.otf</file> + <file>IBMPlexSansDevanagari-Bold.otf</file> + <file>IBMPlexSansArabic-Bold.otf</file> </font> <font name="SansSerif" font_style="ITALIC"> - <file>IBMPlexMono-Italic.ttf</file> + <file>IBMPlexMono-Italic.otf</file> </font> <font name="SansSerif" font_style="BOLD|ITALIC"> - <file>IBMPlexMono-BoldItalic.ttf</file> + <file>IBMPlexMono-BoldItalic.otf</file> </font> <font name="OverrideTest"> - <file>IBMPlexMono-Regular.ttf</file> + <file>IBMPlexMono-Regular.otf</file> </font> <font_size name="Huge" size="16.0" /> diff --git a/indra/newview/skins/default/xui/en/font_mono_sourcecodepro.xml b/indra/newview/skins/default/xui/en/font_mono_sourcecodepro.xml index f820c441f778dbf8e55d3daa88ffd05b432c01e8..91231058135b1b8bcda402be4fc3ea986579fb2a 100644 --- a/indra/newview/skins/default/xui/en/font_mono_sourcecodepro.xml +++ b/indra/newview/skins/default/xui/en/font_mono_sourcecodepro.xml @@ -1,19 +1,19 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <fonts> <font name="Monospace"> - <file>SourceCodePro-Regular.ttf</file> + <file>SourceCodePro-Regular.otf</file> </font> <font name="Monospace" font_style="BOLD"> - <file>SourceCodePro-Bold.ttf</file> + <file>SourceCodePro-Bold.otf</file> </font> <font name="Monospace" font_style="ITALIC"> - <file>SourceCodePro-It.ttf</file> + <file>SourceCodePro-It.otf</file> </font> <font name="Monospace" font_style="BOLD|ITALIC"> - <file>SourceCodePro-BoldIt.ttf</file> + <file>SourceCodePro-BoldIt.otf</file> </font> <font_size name="Monospace" size="8.0" /> diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml index f298128b13ef7723d74f595e4ce9e34f49f544a2..dfc1c8adda75e71a1cafbbfdd72ad7f9f3eab2b0 100644 --- a/indra/newview/skins/default/xui/en/fonts.xml +++ b/indra/newview/skins/default/xui/en/fonts.xml @@ -221,31 +221,31 @@ <!--IBM Plex--> <font name="IBMPlex"> - <file>IBMPlexSans-Regular.ttf</file> - <file>IBMPlexSansJP-Regular.ttf</file> - <file>IBMPlexSansKR-Regular.ttf</file> - <file>IBMPlexSansThai-Regular.ttf</file> - <file>IBMPlexSansHebrew-Regular.ttf</file> - <file>IBMPlexSansDevanagari-Regular.ttf</file> - <file>IBMPlexSansArabic-Regular.ttf</file> + <file>IBMPlexSans-Regular.otf</file> + <file>IBMPlexSansJP-Regular.otf</file> + <file>IBMPlexSansKR-Regular.otf</file> + <file>IBMPlexSansThai-Regular.otf</file> + <file>IBMPlexSansHebrew-Regular.otf</file> + <file>IBMPlexSansDevanagari-Regular.otf</file> + <file>IBMPlexSansArabic-Regular.otf</file> </font> <font name="IBMPlex" font_style="BOLD"> - <file>IBMPlexSans-Bold.ttf</file> - <file>IBMPlexSansJP-Bold.ttf</file> - <file>IBMPlexSansKR-Bold.ttf</file> - <file>IBMPlexSansThai-Bold.ttf</file> - <file>IBMPlexSansHebrew-Bold.ttf</file> - <file>IBMPlexSansDevanagari-Bold.ttf</file> - <file>IBMPlexSansArabic-Bold.ttf</file> + <file>IBMPlexSans-Bold.otf</file> + <file>IBMPlexSansJP-Bold.otf</file> + <file>IBMPlexSansKR-Bold.otf</file> + <file>IBMPlexSansThai-Bold.otf</file> + <file>IBMPlexSansHebrew-Bold.otf</file> + <file>IBMPlexSansDevanagari-Bold.otf</file> + <file>IBMPlexSansArabic-Bold.otf</file> </font> <font name="IBMPlex" font_style="ITALIC"> - <file>IBMPlexSans-Italic.ttf</file> + <file>IBMPlexSans-Italic.otf</file> </font> <font name="IBMPlex" font_style="BOLD|ITALIC"> - <file>IBMPlexSans-BoldItalic.ttf</file> + <file>IBMPlexSans-BoldItalic.otf</file> </font> <font_size name="Monospace" font="IBMPlex" size="8.0" /> @@ -302,21 +302,21 @@ <!--Source Sans 3--> <font name="SourceSans"> - <file>SourceSans3-Regular.ttf</file> + <file>SourceSans3-Regular.otf</file> <file load_collection="true">SourceHanSans-Regular.ttc</file> </font> <font name="SourceSans" font_style="BOLD"> - <file>SourceSans3-Bold.ttf</file> + <file>SourceSans3-Bold.otf</file> <file load_collection="true">SourceHanSans-Bold.ttc</file> </font> <font name="SourceSans" font_style="ITALIC"> - <file>SourceSans3-It.ttf</file> + <file>SourceSans3-It.otf</file> </font> <font name="SourceSans" font_style="BOLD|ITALIC"> - <file>SourceSans3-BoldIt.ttf</file> + <file>SourceSans3-BoldIt.otf</file> </font> <font_size name="Monospace" font="SourceSans" size="8.0" /> @@ -390,19 +390,19 @@ <!--IBM Plex Mono--> <font name="IBMPlexMono"> - <file>IBMPlexMono-Regular.ttf</file> + <file>IBMPlexMono-Regular.otf</file> </font> <font name="IBMPlexMono" font_style="BOLD"> - <file>IBMPlexMono-Bold.ttf</file> + <file>IBMPlexMono-Bold.otf</file> </font> <font name="IBMPlexMono" font_style="ITALIC"> - <file>IBMPlexMono-Italic.ttf</file> + <file>IBMPlexMono-Italic.otf</file> </font> <font name="IBMPlexMono" font_style="BOLD|ITALIC"> - <file>IBMPlexMono-BoldItalic.ttf</file> + <file>IBMPlexMono-BoldItalic.otf</file> </font> <font_size name="Monospace" font="IBMPlexMono" size="8.0" /> @@ -550,21 +550,21 @@ <!--Source Code Pro--> <font name="SourceCodePro"> - <file>SourceCodePro-Regular.ttf</file> + <file>SourceCodePro-Regular.otf</file> <file load_collection="true">SourceHanSans-Regular.ttc</file> </font> <font name="SourceCodePro" font_style="BOLD"> - <file>SourceSans3-Bold.ttf</file> + <file>SourceCodePro-Bold.otf</file> <file load_collection="true">SourceHanSans-Bold.ttc</file> </font> <font name="SourceCodePro" font_style="ITALIC"> - <file>SourceSans3-It.ttf</file> + <file>SourceCodePro-It.otf</file> </font> <font name="SourceCodePro" font_style="BOLD|ITALIC"> - <file>SourceSans3-BoldIt.ttf</file> + <file>SourceCodePro-BoldIt.otf</file> </font> <font_size name="Monospace" font="SourceCodePro" size="8.0" />