diff options
| author | Erik Kundiman <erik@megapahit.org> | 2026-04-19 10:09:39 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2026-04-19 10:09:39 +0800 |
| commit | e7f6b6bfe322378305e30d132a623cabb3770e19 (patch) | |
| tree | 822aaa835742bb7b0595f9122d1511ad2dde24d1 /indra/llrender/llfontgl.cpp | |
| parent | b5be5806b37a5696b4960e1366841dfa3887e567 (diff) | |
| parent | 7014db297d2af37eaf391f0adaca4e8d60d4e1ce (diff) | |
Merge tag 'Second_Life_Release#7014db29-26.2' into 2026.02
Diffstat (limited to 'indra/llrender/llfontgl.cpp')
| -rw-r--r-- | indra/llrender/llfontgl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp index d95eea526b..b2ca9cce75 100644 --- a/indra/llrender/llfontgl.cpp +++ b/indra/llrender/llfontgl.cpp @@ -90,14 +90,14 @@ void LLFontGL::destroyGL() mFontFreetype->destroyGL(); } -bool LLFontGL::loadFace(const std::string& filename, F32 point_size, const F32 vert_dpi, const F32 horz_dpi, bool is_fallback, S32 face_n, EFontHinting hinting, S32 flags) +bool LLFontGL::loadFace(const std::string& filename, F32 point_size, const F32 vert_dpi, const F32 horz_dpi, S32 weight, bool is_fallback, S32 face_n, EFontHinting hinting, S32 flags) { if(mFontFreetype == reinterpret_cast<LLFontFreetype*>(NULL)) { mFontFreetype = new LLFontFreetype; } - return mFontFreetype->loadFace(filename, point_size, vert_dpi, horz_dpi, is_fallback, face_n, hinting, flags); + return mFontFreetype->loadFace(filename, point_size, vert_dpi, horz_dpi, weight, is_fallback, face_n, hinting, flags); } S32 LLFontGL::getNumFaces(const std::string& filename) |
