diff options
| author | Don Kjer <don@lindenlab.com> | 2012-12-06 22:56:21 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-12-06 22:56:21 +0000 |
| commit | 23d77d3a34e48de6e9c69d60cdbd1d70766ad16c (patch) | |
| tree | 84c2878deeb7ba8f4e408365ca53c3d119a15cb1 /indra/llwindow/llwindowsdl.cpp | |
| parent | 07d05c2967fb1013a3f21c1c055ad068b2be9995 (diff) | |
| parent | 97adf6422ac61148a3334d67b4c59a5f5437af2c (diff) | |
Automated merge
Diffstat (limited to 'indra/llwindow/llwindowsdl.cpp')
| -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 c7b141d7c1..9ea76df479 100644 --- a/indra/llwindow/llwindowsdl.cpp +++ b/indra/llwindow/llwindowsdl.cpp @@ -2645,8 +2645,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); } |