From ea98697c3d3e42e67c7cf2e1b111f1623cc10d71 Mon Sep 17 00:00:00 2001
From: Nyx Linden <nyx@lindenlab.com>
Date: Thu, 20 Sep 2012 16:01:03 +0000
Subject: updating mesa build & hash

---
 autobuild.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 70cf2ee6b3..63f281f9b9 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1432,9 +1432,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>19c6ce37e8ce4143d5bb2808ccb8e6ff</string>
+              <string>7c908e4fc031e13e65484d8cfd9a0be5</string>
               <key>url</key>
-              <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-mesa/rev/264880/arch/Linux/installer/mesa-7.11.1-linux-20120918.tar.bz2</string>
+              <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-mesa/rev/264880/arch/Linux/installer/mesa-7.11.1-linux-20120920.tar.bz2</string>
             </map>
             <key>name</key>
             <string>linux</string>
-- 
cgit v1.2.3


From 8edf8b002db02af0abca1b06802bc0041f25c379 Mon Sep 17 00:00:00 2001
From: Nyx Linden <nyx@lindenlab.com>
Date: Thu, 20 Sep 2012 17:49:48 +0000
Subject: BUILDFIX: not including headless libraries if we haven't defined
 llrenderheadless

---
 indra/llrender/CMakeLists.txt | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/indra/llrender/CMakeLists.txt b/indra/llrender/CMakeLists.txt
index 638ab23bd6..f31446924f 100644
--- a/indra/llrender/CMakeLists.txt
+++ b/indra/llrender/CMakeLists.txt
@@ -89,7 +89,6 @@ if ((SERVER OR BAKING) AND NOT WINDOWS AND NOT DARWIN)
       llrender
       )
 
-
   set_source_files_properties(
     ${server_SOURCE_FILES}
     PROPERTIES
@@ -99,12 +98,8 @@ if ((SERVER OR BAKING) AND NOT WINDOWS AND NOT DARWIN)
     ${llrender_SOURCE_FILES}
     ${server_SOURCE_FILES}
     )
-endif ((SERVER OR BAKING) AND NOT WINDOWS AND NOT DARWIN)
 
-add_library (llrender ${llrender_SOURCE_FILES})
-# Libraries on which this library depends, needed for Linux builds
-# Sort by high-level to low-level
-target_link_libraries(llrender 
+target_link_libraries(llrenderheadless
     ${LLCOMMON_LIBRARIES}
     ${LLIMAGE_LIBRARIES}
     ${LLMATH_LIBRARIES}
@@ -113,10 +108,14 @@ target_link_libraries(llrender
     ${LLXML_LIBRARIES}
     ${LLVFS_LIBRARIES}
     ${LLWINDOW_LIBRARIES}
-    ${FREETYPE_LIBRARIES}
     ${OPENGL_LIBRARIES})
 
-target_link_libraries(llrenderheadless
+endif ((SERVER OR BAKING) AND NOT WINDOWS AND NOT DARWIN)
+
+add_library (llrender ${llrender_SOURCE_FILES})
+# Libraries on which this library depends, needed for Linux builds
+# Sort by high-level to low-level
+target_link_libraries(llrender 
     ${LLCOMMON_LIBRARIES}
     ${LLIMAGE_LIBRARIES}
     ${LLMATH_LIBRARIES}
@@ -125,5 +124,6 @@ target_link_libraries(llrenderheadless
     ${LLXML_LIBRARIES}
     ${LLVFS_LIBRARIES}
     ${LLWINDOW_LIBRARIES}
+    ${FREETYPE_LIBRARIES}
     ${OPENGL_LIBRARIES})
 
-- 
cgit v1.2.3