admin/phoenix-firestorm
1
0
Fork 0
mirror of https://github.com/FirestormViewer/phoenix-firestorm.git synced 2026-08-14 08:53:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

#2023 Pull in updated pacakge and mark public

Browse Source 
Unused fonts were excluded
This commit is contained in:
Andrey Kleshchev
2026-04-15 22:27:56 +03:00
parent 740516f01d
commit 7014db297d
4 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
autobuild.xml
+2 -4
View File
@@ -2490,14 +2490,12 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<map>
<key>archive</key>
<map>
<key>creds</key>
<string>github</string>
<key>hash</key>
<string>164a34f4bac8a886217bffb68464a883f8f14cc6</string>
<string>8de96fd083783b9f4df1d8d7028c8a713a7d7217</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://api.github.com/repos/secondlife/3p-google-fonts/releases/assets/396854332</string>
<string>https://github.com/secondlife/3p-google-fonts/releases/download/v1.0.0-r6/google_fonts-1.0.0.24469773244-common-24469773244.tar.zst</string>
</map>
<key>name</key>
<string>common</string>
indra/llrender/llfontfreetype.cpp
+2 -2
View File
@@ -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;
}
indra/newview/skins/default/xui/en/fonts.xml
+11 -11
View File
@@ -4,7 +4,7 @@
<font
name="default"
comment="default font files (global fallbacks)">
<file load_collection="true" font_weight="400">Inter-VariableFont_opsz,wght.ttf</file>
<file load_collection="true" font_weight="400">InterVariableFont.ttf</file>
<file size_delta="-0.5">DejaVuSans.ttf</file>
<file functor="is_emoji">TwemojiSVG.ttf</file>
<os name="Windows">
@@ -37,7 +37,7 @@
<font
name="SansSerifBold"
comment="Name of bold sans-serif font">
<file load_collection="true" flags="bold" font_weight="600">Inter-VariableFont_opsz,wght.ttf</file>
<file load_collection="true" flags="bold" font_weight="600">InterVariableFont.ttf</file>
<file size_delta="-0.5">DejaVuSans-Bold.ttf</file>
<os name="Windows">
<file>arialbd.ttf</file>
@@ -50,7 +50,7 @@
<font
name="SansSerif"
comment="Name of san-serif font (Truetype file name)">
<file load_collection="true" font_weight="400">Inter-VariableFont_opsz,wght.ttf</file>
<file load_collection="true" font_weight="400">InterVariableFont.ttf</file>
<file size_delta="-0.5">DejaVuSans.ttf</file>
<os name="Windows">
<file>arial.ttf</file>
@@ -64,7 +64,7 @@
name="SansSerif"
comment="Name of bold sans-serif font"
font_style="BOLD">
<file load_collection="true" flags="bold" font_weight="600">Inter-VariableFont_opsz,wght.ttf</file>
<file load_collection="true" flags="bold" font_weight="600">InterVariableFont.ttf</file>
<file size_delta="-0.5">DejaVuSans-Bold.ttf</file>
</font>
@@ -72,7 +72,7 @@
name="SansSerif"
comment="Name of italic sans-serif font"
font_style="ITALIC">
<file load_collection="true" font_weight="400">Inter-Italic-VariableFont_opsz,wght.ttf</file>
<file load_collection="true" font_weight="400">InterItalicVariableFont.ttf</file>
<file size_delta="-0.5">DejaVuSans-Oblique.ttf</file>
</font>
@@ -80,7 +80,7 @@
name="SansSerif"
comment="Name of bold italic sans-serif font"
font_style="BOLD|ITALIC">
<file load_collection="true" font_weight="800">Inter-Italic-VariableFont_opsz,wght.ttf</file>
<file load_collection="true" font_weight="800">InterItalicVariableFont.ttf</file>
<file size_delta="-0.5">DejaVuSans-BoldOblique.ttf</file>
</font>
@@ -121,7 +121,7 @@
<font
name="Helvetica"
comment="Name of Helvetica font">
<file font_weight="400">Inter-VariableFont_opsz,wght.ttf</file>
<file font_weight="400">InterVariableFont.ttf</file>
<file size_delta="-0.5">DejaVuSans.ttf</file>
<os name="Windows">
<file>arial.ttf</file>
@@ -135,7 +135,7 @@
name="Helvetica"
comment="Name of Helvetica font (bold)"
font_style="BOLD">
<file flags="bold" font_weight="800">Inter-VariableFont_opsz,wght.ttf</file>
<file flags="bold" font_weight="800">InterVariableFont.ttf</file>
<file size_delta="-0.5">DejaVuSans-Bold.ttf</file>
<os name="Windows">
<file>arialbd.ttf</file>
@@ -149,7 +149,7 @@
name="Helvetica"
comment="Name of Helvetica font (italic)"
font_style="ITALIC">
<file font_weight="400">Inter-Italic-VariableFont_opsz,wght.ttf</file>
<file font_weight="400">InterItalicVariableFont.ttf</file>
<file size_delta="-0.5">DejaVuSans-Oblique.ttf</file>
<os name="Windows">
<file>ariali.ttf</file>
@@ -163,7 +163,7 @@
name="Helvetica"
comment="Name of Helvetica font (bold italic)"
font_style="BOLD|ITALIC">
<file font_weight="800">Inter-Italic-VariableFont_opsz,wght.ttf</file>
<file font_weight="800">InterItalicVariableFont.ttf</file>
<file size_delta="-0.5">DejaVuSans-BoldOblique.ttf</file>
<os name="Windows">
<file>arialbi.ttf</file>
@@ -177,7 +177,7 @@
name="OverrideTest"
comment="Name of font to test overriding">
<file>times.ttf</file>
<file font_weight="400">Inter-VariableFont_opsz,wght.ttf</file>
<file font_weight="400">InterVariableFont.ttf</file>
</font>
<font_size name="Monospace"
indra/newview/skins/default/xui/ja/fonts.xml
+11 -11
View File
@@ -4,7 +4,7 @@
<file>
NotoSansCJKjp-SemiBold.otf
</file>
<file load_collection="true" font_weight="400">Inter-VariableFont_opsz,wght.ttf</file>
<file load_collection="true" font_weight="400">InterVariableFont.ttf</file>
<os name="Windows">
<file load_collection="true">
YuGothM.ttc
@@ -80,7 +80,7 @@
<file>
NotoSansCJKjp-Bold.otf
</file>
<file load_collection="true" font_weight="800" flags="bold">Inter-VariableFont_opsz,wght.ttf</file>
<file load_collection="true" font_weight="800" flags="bold">InterVariableFont.ttf</file>
<os name="Windows">
<file load_collection="true">
YuGothB.ttc
@@ -102,7 +102,7 @@
<file>
NotoSansCJKjp-SemiBold.otf
</file>
<file load_collection="true" font_weight="400">Inter-VariableFont_opsz,wght.ttf</file>
<file load_collection="true" font_weight="400">InterVariableFont.ttf</file>
<os name="Windows">
<file>
arial.ttf
@@ -115,13 +115,13 @@
</os>
</font>
<font name="SansSerif" comment="Name of bold sans-serif font" font_style="BOLD">
<file load_collection="true" font_weight="800" flags="bold">Inter-VariableFont_opsz,wght.ttf</file>
<file load_collection="true" font_weight="800" flags="bold">InterVariableFont.ttf</file>
</font>
<font name="SansSerif" comment="Name of italic sans-serif font" font_style="ITALIC">
<file load_collection="true" font_weight="400">Inter-Italic-VariableFont_opsz,wght.ttf</file>
<file load_collection="true" font_weight="400">InterItalicVariableFont.ttf</file>
</font>
<font name="SansSerif" comment="Name of bold italic sans-serif font" font_style="BOLD|ITALIC">
<file load_collection="true" flags="bold" font_weight="800">Inter-Italic-VariableFont_opsz,wght.ttf</file>
<file load_collection="true" flags="bold" font_weight="800">InterItalicVariableFont.ttf</file>
</font>
<font name="Monospace" comment="Name of monospace font">
<file>
@@ -150,7 +150,7 @@
</file>
</font>
<font name="Helvetica" comment="Name of Helvetica font">
<file load_collection="true" font_weight="400">Inter-VariableFont_opsz,wght.ttf</file>
<file load_collection="true" font_weight="400">InterVariableFont.ttf</file>
<os name="Windows">
<file>
arial.ttf
@@ -163,7 +163,7 @@
</os>
</font>
<font name="Helvetica" comment="Name of Helvetica font (bold)" font_style="BOLD">
<file load_collection="true" font_weight="800" flags="bold">Inter-VariableFont_opsz,wght.ttf</file>
<file load_collection="true" font_weight="800" flags="bold">InterVariableFont.ttf</file>
<os name="Windows">
<file>
arialbd.ttf
@@ -176,7 +176,7 @@
</os>
</font>
<font name="Helvetica" comment="Name of Helvetica font (italic)" font_style="ITALIC">
<file load_collection="true" font_weight="400">Inter-Italic-VariableFont_opsz,wght.ttf</file>
<file load_collection="true" font_weight="400">InterItalicVariableFont.ttf</file>
<os name="Windows">
<file>
ariali.ttf
@@ -189,7 +189,7 @@
</os>
</font>
<font name="Helvetica" comment="Name of Helvetica font (bold italic)" font_style="BOLD|ITALIC">
<file load_collection="true" flags="bold" font_weight="800">Inter-Italic-VariableFont_opsz,wght.ttf</file>
<file load_collection="true" flags="bold" font_weight="800">InterItalicVariableFont.ttf</file>
<os name="Windows">
<file>
arialbi.ttf
@@ -205,7 +205,7 @@
<file>
times.ttf
</file>
<file font_weight="400">Inter-VariableFont_opsz,wght.ttf</file>
<file font_weight="400">InterVariableFont.ttf</file>
</font>
<font_size name="Monospace" comment="Size for monospaced font (points, or 1/72 of an inch)" size="8.0"/>
<font_size name="Huge" comment="Size of huge font (points, or 1/72 of an inch)" size="16.0"/>