diff options
| author | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2012-12-12 10:58:47 -0800 |
|---|---|---|
| committer | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2012-12-12 10:58:47 -0800 |
| commit | 716e2ea3b1e25ac8da64343d02310e8f086c48e7 (patch) | |
| tree | 5e75da7a335881149c72d93525d275c6338fc1b5 /indra/llwindow | |
| parent | 57db08d7927a4a93b8825405201e9e21efb8c756 (diff) | |
| parent | edcdce226a7ff599e43c89fe7e4d37350650ae96 (diff) | |
Pull and merge viewer-development
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 5afe0b0953..a15114cb9b 100644 --- a/indra/llwindow/llwindowsdl.cpp +++ b/indra/llwindow/llwindowsdl.cpp @@ -2663,8 +2663,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); } |