MAINT-2968 disable client GL namegen, go spec

2013-10-13 17:07:45 +02:00
parent aa077032b7
commit 19625ea6b8
12 changed files with 47 additions and 161 deletions
--- a/indra/llappearance/lltexlayer.cpp
+++ b/indra/llappearance/lltexlayer.cpp
@@ -1126,7 +1126,10 @@ BOOL LLTexLayer::render(S32 x, S32 y, S32 width, S32 height)
 	// *TODO: Is this correct?
 	//gPipeline.disableLights();
 	stop_glerror();
-	glDisable(GL_LIGHTING);
+	if (!LLGLSLShader::sNoFixedFunction)
+	{
+		glDisable(GL_LIGHTING);
+	}
 	stop_glerror();

 	bool use_shaders = LLGLSLShader::sNoFixedFunction;