summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2012-12-05 16:40:39 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2012-12-05 16:40:39 -0500
commitbe9c0574f97b65079c80c2bc5ce5a12597a9840a (patch)
tree254deee95451de6c5aefe89c479a26e715fa5e77 /indra
parent7d419d59009d429c8d9480adf3ae163d5c688126 (diff)
parent32f5015ecd29ec664a79c2ce86fa7c462f5f7561 (diff)
merge
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);
}