summaryrefslogtreecommitdiff
path: root/indra/llwindow/llwindowsdl.cpp
diff options
context:
space:
mode:
authordolphin <dolphin@lindenlab.com>2013-01-02 09:47:17 -0800
committerdolphin <dolphin@lindenlab.com>2013-01-02 09:47:17 -0800
commite018720278af674528f43acc40af40a1d3d64e7d (patch)
tree8f5e789148654315283d9ac5b74f89c15a7fa42d /indra/llwindow/llwindowsdl.cpp
parent179e944f45476e03eb7b828e427f9d299529ad12 (diff)
parentcd1871d2e39bfee8a6e5bc61ece40a764ff7cdb4 (diff)
Merge
Diffstat (limited to 'indra/llwindow/llwindowsdl.cpp')
-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..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);
}