From 91cb40132456462be4f96a2c809aa4bf5f411595 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Fri, 2 Sep 2011 05:56:04 -0500
Subject: [PATCH] Don't use shaders for dynamic textures.... again.

---
 indra/newview/lldynamictexture.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/indra/newview/lldynamictexture.cpp b/indra/newview/lldynamictexture.cpp
index 0d8e16a48..bd39ece0a 100644
--- a/indra/newview/lldynamictexture.cpp
+++ b/indra/newview/lldynamictexture.cpp
@@ -42,6 +42,7 @@
 #include "llvertexbuffer.h"
 #include "llviewerdisplay.h"
 #include "llrender.h"
+#include "llglslshader.h"
 
 // static
 LLViewerDynamicTexture::instance_list_t LLViewerDynamicTexture::sInstances[ LLViewerDynamicTexture::ORDER_COUNT ];
@@ -210,6 +211,12 @@ BOOL LLViewerDynamicTexture::updateAllInstances()
 		return TRUE;
 	}
 
+	LLGLSLShader::bindNoShader();
+	LLVertexBuffer::unbind();
+	
+	bool no_ff = LLGLSLShader::sNoFixedFunction;
+	LLGLSLShader::sNoFixedFunction = false;
+
 	BOOL result = FALSE;
 	BOOL ret = FALSE ;
 	for( S32 order = 0; order < ORDER_COUNT; order++ )
@@ -240,6 +247,8 @@ BOOL LLViewerDynamicTexture::updateAllInstances()
 		}
 	}
 
+	LLGLSLShader::sNoFixedFunction = no_ff;
+
 	return ret;
 }