diff options
| author | Andrey Lihatskiy <118752495+marchcat@users.noreply.github.com> | 2026-07-24 12:26:16 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-07-24 12:26:16 +0300 |
| commit | e32d763ccbe1b02c7d74a5b63712ec946a24b42e (patch) | |
| tree | f09286325dfcda29510115ff6d8c2fdb71e7ff5c /indra/llwindow/llwindow.cpp | |
| parent | a6a2f98070cd55fcaadafc237bd0ffba9d466655 (diff) | |
| parent | cd7295e09b354a99c29f2bb80da7c0a77ccb0457 (diff) | |
Merge pull request #5993 from nibbbl/cjk-lazy-font-fallback
Fix missing CJK/Indic text on Linux with lazy font fallback
Diffstat (limited to 'indra/llwindow/llwindow.cpp')
| -rw-r--r-- | indra/llwindow/llwindow.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/indra/llwindow/llwindow.cpp b/indra/llwindow/llwindow.cpp index 2313aeda50..b6177abfc7 100644 --- a/indra/llwindow/llwindow.cpp +++ b/indra/llwindow/llwindow.cpp @@ -268,6 +268,20 @@ std::vector<std::string> LLWindow::getDynamicFallbackFontList() } // static +LLFontFallbackMatch LLWindow::findFallbackFontForChar(llwchar wch) +{ +#if LL_SDL_WINDOW && !LL_MESA_HEADLESS + return LLWindowSDL::findFallbackFontForChar(wch); +#elif LL_WINDOWS + return LLWindowWin32::findFallbackFontForChar(wch); +#elif LL_DARWIN + return LLWindowMacOSX::findFallbackFontForChar(wch); +#else + return LLFontFallbackMatch(); +#endif +} + +// static std::vector<std::string> LLWindow::getDisplaysResolutionList() { #if LL_SDL_WINDOW && !LL_MESA_HEADLESS |