diff --git a/indra/newview/lldynamictexture.cpp b/indra/newview/lldynamictexture.cpp
index bd39ece0a..b53cfd649 100644
--- a/indra/newview/lldynamictexture.cpp
+++ b/indra/newview/lldynamictexture.cpp
@@ -215,7 +215,9 @@ BOOL LLViewerDynamicTexture::updateAllInstances()
 	LLVertexBuffer::unbind();
 	
 	bool no_ff = LLGLSLShader::sNoFixedFunction;
-	LLGLSLShader::sNoFixedFunction = false;
+	static const LLCachedControl<bool> force_fixed_functions("ShyotlUseLegacyDynamicTexture",false);
+	if(force_fixed_functions)
+		LLGLSLShader::sNoFixedFunction = false;
 
 	BOOL result = FALSE;
 	BOOL ret = FALSE ;
diff --git a/indra/newview/lltexlayer.cpp b/indra/newview/lltexlayer.cpp
index 0a4bd6d98..e2ec067ca 100644
--- a/indra/newview/lltexlayer.cpp
+++ b/indra/newview/lltexlayer.cpp
@@ -268,7 +268,9 @@ BOOL LLTexLayerSetBuffer::render()
 
 	//hack to use fixed function when updating tex layer sets
 	bool no_ff = LLGLSLShader::sNoFixedFunction;
-	LLGLSLShader::sNoFixedFunction = false;
+	static const LLCachedControl<bool> force_fixed_functions("ShyotlUseLegacyTextureBaking",true);
+	if(force_fixed_functions)
+		LLGLSLShader::sNoFixedFunction = false;
 
 	// Composite the color data
 	LLGLSUIDefault gls_ui;