diff options
| author | Kitty Barnett <develop@catznip.com> | 2012-12-17 00:09:01 +0100 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2012-12-17 00:09:01 +0100 |
| commit | 5824e60c595a3004ba24c250cad72a5eace8013f (patch) | |
| tree | a3f6839f56c3b19b59eb3509423354ebd12d4814 /indra/llwindow | |
| parent | a18ea9d92923e331c0a3e179e126659e694b1c07 (diff) | |
| parent | 74d3dc41fb7e24410ba052a9c5ce2867fbdb9c0a (diff) | |
Merge with viewer-materials tip
Diffstat (limited to 'indra/llwindow')
| -rw-r--r-- | indra/llwindow/llwindowsdl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp index 3bf4a48cb6..39f8a36a6e 100644 --- a/indra/llwindow/llwindowsdl.cpp +++ b/indra/llwindow/llwindowsdl.cpp @@ -2646,8 +2646,9 @@ std::vector<std::string> LLWindowSDL::getDynamicFallbackFontList() if (sortpat) { // Sort the list of system fonts from most-to-least-desirable. + FcResult result; fs = FcFontSort(NULL, sortpat, elide_unicode_coverage, - NULL, NULL); + NULL, &result); FcPatternDestroy(sortpat); } |