diff --git a/indra/newview/app_settings/shaders/class1/objects/bumpV.glsl b/indra/newview/app_settings/shaders/class1/objects/bumpV.glsl
index 056d1a958..3213ea4d6 100644
--- a/indra/newview/app_settings/shaders/class1/objects/bumpV.glsl
+++ b/indra/newview/app_settings/shaders/class1/objects/bumpV.glsl
@@ -11,6 +11,6 @@ void main()
 	//transform vertex
 	gl_Position = gl_ModelViewProjectionMatrix*gl_Vertex;
 	gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0;
-	gl_TexCoord[1] = gl_TextureMatrix[1] * gl_MultiTexCoord1;
+	gl_TexCoord[1] = gl_TextureMatrix[0] * gl_MultiTexCoord1;
 	gl_FrontColor = gl_Color;
 }
diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp
index 649559aac..d6516c520 100644
--- a/indra/newview/lldrawpoolbump.cpp
+++ b/indra/newview/lldrawpoolbump.cpp
@@ -1374,11 +1374,16 @@ void LLDrawPoolBump::pushBatch(LLDrawInfo& params, U32 mask, BOOL texture, BOOL
 			}
 			else
 			{
-				gGL.getTexUnit(1)->activate();
+				if (!gPipeline.canUseVertexShaders())
+				{
+					gGL.getTexUnit(1)->activate();
+					glMatrixMode(GL_TEXTURE);
+					glLoadMatrixf((GLfloat*) params.mTextureMatrix->mMatrix);
+				}
+				gGL.getTexUnit(0)->activate();
 				glMatrixMode(GL_TEXTURE);
 				glLoadMatrixf((GLfloat*) params.mTextureMatrix->mMatrix);
 				gPipeline.mTextureMatrixOps++;
-				gGL.getTexUnit(0)->activate();
 			}
 
 			glLoadMatrixf((GLfloat*) params.mTextureMatrix->mMatrix);
@@ -1415,9 +1420,14 @@ void LLDrawPoolBump::pushBatch(LLDrawInfo& params, U32 mask, BOOL texture, BOOL
 		}
 		else
 		{
-			gGL.getTexUnit(1)->activate();
-			glLoadIdentity();
+			if (!gPipeline.canUseVertexShaders())
+			{
+				gGL.getTexUnit(1)->activate();
+				glMatrixMode(GL_TEXTURE);
+				glLoadIdentity();
+			}
 			gGL.getTexUnit(0)->activate();
+			glMatrixMode(GL_TEXTURE);
 		}
 		glLoadIdentity();
 		glMatrixMode(GL_MODELVIEW);