diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-12-04 16:54:19 -0800 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-12-04 16:54:19 -0800 |
| commit | 44abb8c3bf4ae3edc871583bd1fa19f10c72fdf1 (patch) | |
| tree | c62ee17a9d7036691fab84f323bdb07587ade13c /indra/llwindow | |
| parent | a5b6142f6b53608769cfb3c33dbbbf3710b86d1b (diff) | |
| parent | a15ec8d014307da35b792659964cd5478d1aafe7 (diff) | |
Pull and merge from https://bitbucket.org/lindenlab/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 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); } |