summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rw-r--r--indra/llrender/llfontfreetype.cpp4
-rw-r--r--indra/newview/skins/default/xui/en/fonts.xml22
-rw-r--r--indra/newview/skins/default/xui/ja/fonts.xml22
3 files changed, 24 insertions, 24 deletions
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 @@
<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"
diff --git a/indra/newview/skins/default/xui/ja/fonts.xml b/indra/newview/skins/default/xui/ja/fonts.xml
index 73abf542d4..06922d2b02 100644
--- a/indra/newview/skins/default/xui/ja/fonts.xml
+++ b/indra/newview/skins/default/xui/ja/fonts.xml
@@ -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"/>
generated by cgit v1.3 (git 2.53.0) at 2026-05-22 13:23:53 +0000