summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorprep <prep@lindenlab.com>2012-12-05 12:43:35 -0500
committerprep <prep@lindenlab.com>2012-12-05 12:43:35 -0500
commit65998aaea89a273831f25340503346ef91e9a91e (patch)
tree2444bb8e389d9a2b9065e4da948edafb44d59dbb /indra
parent3be13024c51a714aa94ac55c2a972d3f523024f9 (diff)
parenta15ec8d014307da35b792659964cd5478d1aafe7 (diff)
Pull from viewer-development
Diffstat (limited to 'indra')
-rw-r--r--indra/llwindow/llwindowsdl.cpp3
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);
}