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 | |
| parent | a5b6142f6b53608769cfb3c33dbbbf3710b86d1b (diff) | |
| parent | a15ec8d014307da35b792659964cd5478d1aafe7 (diff) | |
Pull and merge from https://bitbucket.org/lindenlab/viewer-development.
| -rwxr-xr-x | .hgtags | 1 | ||||
| -rw-r--r-- | indra/llwindow/llwindowsdl.cpp | 3 |
2 files changed, 3 insertions, 1 deletions
@@ -368,3 +368,4 @@ f4481df42f9a4a92bf475a80f0c51d1a4bbdfd59 DRTVWR-246 39c5204b6e800983a41ccac8ad6dc993120197c6 DRTVWR-247 7c7d57d393e8ae7b61623279de06eb4a62ccae6a DRTVWR-249 f72b50ef168c159d6e79e97aa2bcafaf8577ab99 DRTVWR-230 +b418be80903520c492e1173f3afbc4021cad5d07 DRTVWR-255 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); } |