From 828cb2cc5a0d000f32dd2aad975ce45190daa814 Mon Sep 17 00:00:00 2001
From: Tonya Souther <tonya.souther@gmail.com>
Date: Thu, 17 Jan 2013 18:04:43 -0600
Subject: [PATCH] Fix shader link failures on 64-bit Linux with ATI and maximum
 texture index > 1.

---
 indra/llrender/llshadermgr.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp
index 96611547f2..7e1a0f2975 100644
--- a/indra/llrender/llshadermgr.cpp
+++ b/indra/llrender/llshadermgr.cpp
@@ -713,9 +713,12 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade
 
 			// text[count++] = strdup("VARYING_FLAT int vary_texture_index;\n");
 			
+			// <FS:TS> This causes shader link failures on 64-bit Linux
+#if !(LL_GNUC && ( defined(__amd64__) || defined(__x86_64__) ) )
 			if( gGLManager.mIsATI )
 				text[count++] = strdup("VARYING int vary_texture_index;\n");
 			else
+#endif
 				text[count++] = strdup("VARYING_FLAT int vary_texture_index;\n");
 
 			// </FS:ND>