diff options
author | David Walter Seikel | 2013-04-17 19:07:44 +1000 |
---|---|---|
committer | David Walter Seikel | 2013-04-17 19:07:44 +1000 |
commit | c16929159920e75aa44cb72350ca37890dbd0f31 (patch) | |
tree | b60bb88a031b9d6ba622a7fde0808b687dd8bc82 /linden | |
parent | Attempt to fix up Windows yyparse issue, but ultimately fail, then notice it'... (diff) | |
download | meta-impy-c16929159920e75aa44cb72350ca37890dbd0f31.zip meta-impy-c16929159920e75aa44cb72350ca37890dbd0f31.tar.gz meta-impy-c16929159920e75aa44cb72350ca37890dbd0f31.tar.bz2 meta-impy-c16929159920e75aa44cb72350ca37890dbd0f31.tar.xz |
Potential fix for http://redmine.kokuaviewer.org/issues/1215 but needs testing.
Diffstat (limited to 'linden')
-rw-r--r-- | linden/indra/llwindow/llwindowsdl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/llwindow/llwindowsdl.cpp b/linden/indra/llwindow/llwindowsdl.cpp index 2f9de6b..69ec3b3 100644 --- a/linden/indra/llwindow/llwindowsdl.cpp +++ b/linden/indra/llwindow/llwindowsdl.cpp | |||
@@ -2521,9 +2521,10 @@ std::vector<std::string> LLWindowSDL::getDynamicFallbackFontList() | |||
2521 | sortpat = FcNameParse((FcChar8*) sort_order.c_str()); | 2521 | sortpat = FcNameParse((FcChar8*) sort_order.c_str()); |
2522 | if (sortpat) | 2522 | if (sortpat) |
2523 | { | 2523 | { |
2524 | FcResult dummyResult; | ||
2524 | // Sort the list of system fonts from most-to-least-desirable. | 2525 | // Sort the list of system fonts from most-to-least-desirable. |
2525 | fs = FcFontSort(NULL, sortpat, elide_unicode_coverage, | 2526 | fs = FcFontSort(NULL, sortpat, elide_unicode_coverage, |
2526 | NULL, NULL); | 2527 | NULL, &dummyResult); |
2527 | FcPatternDestroy(sortpat); | 2528 | FcPatternDestroy(sortpat); |
2528 | } | 2529 | } |
2529 | 2530 | ||