diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp
index 0b50e530b7..07f5fb2c86 100755
--- a/indra/llrender/llglslshader.cpp
+++ b/indra/llrender/llglslshader.cpp
@@ -272,10 +272,13 @@ void LLGLSLShader::readProfileQuery(U32 count, U32 mode)
 	glEndQueryARB(GL_TIME_ELAPSED);
 	glEndQueryARB(GL_SAMPLES_PASSED);
 	
-	U64 time_elapsed = 0;
+	//<FS:TS> U64 and GLuint64 somehow turn out different on x86_64
+	//U64 time_elapsed = 0;
+	GLuint64 time_elapsed = 0;
 	glGetQueryObjectui64v(mTimerQuery, GL_QUERY_RESULT, &time_elapsed);
 
-	U64 samples_passed = 0;
+	//U64 samples_passed = 0;
+	GLuint64 samples_passed = 0;
 	glGetQueryObjectui64v(1, GL_QUERY_RESULT, &samples_passed);
 
 	sTotalTimeElapsed += time_elapsed;