From 6cff95f8c74e5fd647edbb4b1fb502ee4fa9f81a Mon Sep 17 00:00:00 2001
From: Logan Dethrow <log@lindenlab.com>
Date: Fri, 30 Nov 2012 18:26:56 -0500
Subject: Fix for STORM-1854. Adapted the fix based on other open source
 consumers of fontconfig that were encountering the same error.

---
 indra/llwindow/llwindowsdl.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/llwindow/llwindowsdl.cpp')

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);
 	}
 
-- 
cgit v1.2.3


From 3e8fdb9daa5186d8f80f53c5e6f19c0ef95c2fda Mon Sep 17 00:00:00 2001
From: Logan Dethrow <log@lindenlab.com>
Date: Sat, 1 Dec 2012 00:12:32 +0000
Subject: Fixed previous commit.

---
 indra/llwindow/llwindowsdl.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llwindow/llwindowsdl.cpp')

diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp
index 12edb055d2..39f8a36a6e 100644
--- a/indra/llwindow/llwindowsdl.cpp
+++ b/indra/llwindow/llwindowsdl.cpp
@@ -2648,7 +2648,7 @@ std::vector<std::string> LLWindowSDL::getDynamicFallbackFontList()
 		// Sort the list of system fonts from most-to-least-desirable.
 		FcResult result;
 		fs = FcFontSort(NULL, sortpat, elide_unicode_coverage,
-				NULL, result);
+				NULL, &result);
 		FcPatternDestroy(sortpat);
 	}
 
-- 
cgit v1.2.3