From 6ee601c642b3a4fa182334eb1ca015d71d6eaedd Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> Date: Tue, 14 Apr 2026 23:17:36 +0300 Subject: #2023 Load from a variable font WIP, beacsue variable fonts are not yeat included. --- autobuild.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 32c9bc27af..2580a4dc65 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2493,11 +2493,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors creds github hash - 9bd007dd70635d85d716ca00484cefa700cdb6f0 + 164a34f4bac8a886217bffb68464a883f8f14cc6 hash_algorithm sha1 url - https://api.github.com/repos/secondlife/3p-google-fonts/releases/assets/365756469 + https://api.github.com/repos/secondlife/3p-google-fonts/releases/assets/396854332 name common -- cgit v1.3 From 7014db297d2af37eaf391f0adaca4e8d60d4e1ce Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> Date: Wed, 15 Apr 2026 19:41:20 +0300 Subject: #2023 Pull in updated pacakge and mark public Unused fonts were excluded --- autobuild.xml | 6 ++---- indra/llrender/llfontfreetype.cpp | 4 ++-- indra/newview/skins/default/xui/en/fonts.xml | 22 +++++++++++----------- indra/newview/skins/default/xui/ja/fonts.xml | 22 +++++++++++----------- 4 files changed, 26 insertions(+), 28 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 2580a4dc65..4282c2197c 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2490,14 +2490,12 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive - creds - github hash - 164a34f4bac8a886217bffb68464a883f8f14cc6 + 8de96fd083783b9f4df1d8d7028c8a713a7d7217 hash_algorithm sha1 url - https://api.github.com/repos/secondlife/3p-google-fonts/releases/assets/396854332 + https://github.com/secondlife/3p-google-fonts/releases/download/v1.0.0-r6/google_fonts-1.0.0.24469773244-common-24469773244.tar.zst name common diff --git a/indra/llrender/llfontfreetype.cpp b/indra/llrender/llfontfreetype.cpp index 8d31d5d2ae..19326d301e 100644 --- a/indra/llrender/llfontfreetype.cpp +++ b/indra/llrender/llfontfreetype.cpp @@ -932,7 +932,7 @@ bool LLFontFreetype::setVariationAxis(const std::string& axis_tag, F32 value) if (!found) { FT_Done_MM_Var(gFTLibrary, master); - LL_WARNS_ONCE("FontVariation") << "Axis '" << axis_tag << "' not found in font: " << mName << LL_ENDL; + LL_WARNS_ONCE("Font") << "Axis '" << axis_tag << "' not found in font: " << mName << LL_ENDL; return false; } @@ -958,7 +958,7 @@ bool LLFontFreetype::setVariationAxis(const std::string& axis_tag, F32 value) return false; } - LL_INFOS("FontVariation") << "Set " << axis_tag << " = " << value + LL_DEBUGS("Font") << "Set " << axis_tag << " = " << value << " for font: " << mName << LL_ENDL; return true; } diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml index efa4706485..3c6e100541 100644 --- a/indra/newview/skins/default/xui/en/fonts.xml +++ b/indra/newview/skins/default/xui/en/fonts.xml @@ -4,7 +4,7 @@ - Inter-VariableFont_opsz,wght.ttf + InterVariableFont.ttf DejaVuSans.ttf TwemojiSVG.ttf @@ -37,7 +37,7 @@ - Inter-VariableFont_opsz,wght.ttf + InterVariableFont.ttf DejaVuSans-Bold.ttf arialbd.ttf @@ -50,7 +50,7 @@ - Inter-VariableFont_opsz,wght.ttf + InterVariableFont.ttf DejaVuSans.ttf arial.ttf @@ -64,7 +64,7 @@ name="SansSerif" comment="Name of bold sans-serif font" font_style="BOLD"> - Inter-VariableFont_opsz,wght.ttf + InterVariableFont.ttf DejaVuSans-Bold.ttf @@ -72,7 +72,7 @@ name="SansSerif" comment="Name of italic sans-serif font" font_style="ITALIC"> - Inter-Italic-VariableFont_opsz,wght.ttf + InterItalicVariableFont.ttf DejaVuSans-Oblique.ttf @@ -80,7 +80,7 @@ name="SansSerif" comment="Name of bold italic sans-serif font" font_style="BOLD|ITALIC"> - Inter-Italic-VariableFont_opsz,wght.ttf + InterItalicVariableFont.ttf DejaVuSans-BoldOblique.ttf @@ -121,7 +121,7 @@ - Inter-VariableFont_opsz,wght.ttf + InterVariableFont.ttf DejaVuSans.ttf arial.ttf @@ -135,7 +135,7 @@ name="Helvetica" comment="Name of Helvetica font (bold)" font_style="BOLD"> - Inter-VariableFont_opsz,wght.ttf + InterVariableFont.ttf DejaVuSans-Bold.ttf arialbd.ttf @@ -149,7 +149,7 @@ name="Helvetica" comment="Name of Helvetica font (italic)" font_style="ITALIC"> - Inter-Italic-VariableFont_opsz,wght.ttf + InterItalicVariableFont.ttf DejaVuSans-Oblique.ttf ariali.ttf @@ -163,7 +163,7 @@ name="Helvetica" comment="Name of Helvetica font (bold italic)" font_style="BOLD|ITALIC"> - Inter-Italic-VariableFont_opsz,wght.ttf + InterItalicVariableFont.ttf DejaVuSans-BoldOblique.ttf arialbi.ttf @@ -177,7 +177,7 @@ name="OverrideTest" comment="Name of font to test overriding"> times.ttf - Inter-VariableFont_opsz,wght.ttf + InterVariableFont.ttf NotoSansCJKjp-SemiBold.otf - Inter-VariableFont_opsz,wght.ttf + InterVariableFont.ttf YuGothM.ttc @@ -80,7 +80,7 @@ NotoSansCJKjp-Bold.otf - Inter-VariableFont_opsz,wght.ttf + InterVariableFont.ttf YuGothB.ttc @@ -102,7 +102,7 @@ NotoSansCJKjp-SemiBold.otf - Inter-VariableFont_opsz,wght.ttf + InterVariableFont.ttf arial.ttf @@ -115,13 +115,13 @@ - Inter-VariableFont_opsz,wght.ttf + InterVariableFont.ttf - Inter-Italic-VariableFont_opsz,wght.ttf + InterItalicVariableFont.ttf - Inter-Italic-VariableFont_opsz,wght.ttf + InterItalicVariableFont.ttf @@ -150,7 +150,7 @@ - Inter-VariableFont_opsz,wght.ttf + InterVariableFont.ttf arial.ttf @@ -163,7 +163,7 @@ - Inter-VariableFont_opsz,wght.ttf + InterVariableFont.ttf arialbd.ttf @@ -176,7 +176,7 @@ - Inter-Italic-VariableFont_opsz,wght.ttf + InterItalicVariableFont.ttf ariali.ttf @@ -189,7 +189,7 @@ - Inter-Italic-VariableFont_opsz,wght.ttf + InterItalicVariableFont.ttf arialbi.ttf @@ -205,7 +205,7 @@ times.ttf - Inter-VariableFont_opsz,wght.ttf + InterVariableFont.ttf -- cgit v1.3