diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-01-14 10:59:46 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-01-14 10:59:46 -0800 |
| commit | 44737a3992b112c8191593e71533c19e4c10f911 (patch) | |
| tree | eb2f965f49bf442939724ed8ec312ad7e3806ac9 /indra/llwindow/llwindowsdl.cpp | |
| parent | e42755dd16195244a6743fc3970f24fec08f03b9 (diff) | |
| parent | 23ffb7db1bb065b5afbdcb94eab57720d604ae8d (diff) | |
merging latest changes
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 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); } |