summaryrefslogtreecommitdiff
path: root/indra/llwindow
diff options
context:
space:
mode:
authorLogan Dethrow <log@lindenlab.com>2012-11-30 18:26:56 -0500
committerLogan Dethrow <log@lindenlab.com>2012-11-30 18:26:56 -0500
commit6cff95f8c74e5fd647edbb4b1fb502ee4fa9f81a (patch)
tree1c849b2b16d8d20703ee72385f55da24d0373783 /indra/llwindow
parentf5a47417fde70f78b99744386c6da0bcf78e60d5 (diff)
Fix for STORM-1854. Adapted the fix based on other open source consumers of fontconfig that were encountering the same error.
Diffstat (limited to 'indra/llwindow')
-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 3bf4a48cb6..12edb055d2 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);
}