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(-)

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(-)

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


From a15ec8d014307da35b792659964cd5478d1aafe7 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 4 Dec 2012 11:06:29 -0500
Subject: tag merge of DRTVWR-255

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 636671b4c9..9e61f184f3 100755
--- a/.hgtags
+++ b/.hgtags
@@ -368,3 +368,4 @@ f4481df42f9a4a92bf475a80f0c51d1a4bbdfd59 DRTVWR-246
 39c5204b6e800983a41ccac8ad6dc993120197c6 DRTVWR-247
 7c7d57d393e8ae7b61623279de06eb4a62ccae6a DRTVWR-249
 f72b50ef168c159d6e79e97aa2bcafaf8577ab99 DRTVWR-230
+b418be80903520c492e1173f3afbc4021cad5d07 DRTVWR-255
-- 
cgit v1.2.3


From 32f5015ecd29ec664a79c2ce86fa7c462f5f7561 Mon Sep 17 00:00:00 2001
From: prep <prep@lindenlab.com>
Date: Wed, 5 Dec 2012 14:33:30 -0500
Subject: Added back in mesa package for linux builds

---
 autobuild.xml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/autobuild.xml b/autobuild.xml
index f5ea967b32..82344ebc90 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1452,6 +1452,30 @@
             <string>windows</string>
           </map>
         </map>
+      </map>
+	  <key>mesa</key>
+      <map>
+        <key>license</key>
+        <string>mesa</string>
+        <key>license_file</key>
+        <string>LICENSES/mesa.txt</string>
+        <key>name</key>
+        <string>mesa</string>
+        <key>platforms</key>
+        <map>
+          <key>linux</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>1f600840463c7327ea17486821425750</string>
+              <key>url</key>
+              <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/mesa-7.0-linux-20100930.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>linux</string>
+          </map>
+        </map>
       </map>
       <key>ndofdev</key>
       <map>
-- 
cgit v1.2.3