diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index b19707d5e8..06985ee11c 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -6485,13 +6485,20 @@ void LLSelectNode::renderOneWireframe(const LLColor4& color)
 		}
 		else
 		{
-			LLGLEnable fog(GL_FOG);
-			glFogi(GL_FOG_MODE, GL_LINEAR);
-			float d = (LLViewerCamera::getInstance()->getPointOfInterest()-LLViewerCamera::getInstance()->getOrigin()).magVec();
-			LLColor4 fogCol = color * (F32)llclamp((LLSelectMgr::getInstance()->getSelectionCenterGlobal()-gAgentCamera.getCameraPositionGlobal()).magVec()/(LLSelectMgr::getInstance()->getBBoxOfSelection().getExtentLocal().magVec()*4), 0.0, 1.0);
-			glFogf(GL_FOG_START, d);
-			glFogf(GL_FOG_END, d*(1 + (LLViewerCamera::getInstance()->getView() / LLViewerCamera::getInstance()->getDefaultFOV())));
-			glFogfv(GL_FOG_COLOR, fogCol.mV);
+			// <FS:Ansariel> Don't use fixed functions when using shader renderer; found by Drake Arconis
+			if (!LLGLSLShader::sNoFixedFunction)
+			{
+			// </FS:Ansariel>
+				LLGLEnable fog(GL_FOG);
+				glFogi(GL_FOG_MODE, GL_LINEAR);
+				float d = (LLViewerCamera::getInstance()->getPointOfInterest()-LLViewerCamera::getInstance()->getOrigin()).magVec();
+				LLColor4 fogCol = color * (F32)llclamp((LLSelectMgr::getInstance()->getSelectionCenterGlobal()-gAgentCamera.getCameraPositionGlobal()).magVec()/(LLSelectMgr::getInstance()->getBBoxOfSelection().getExtentLocal().magVec()*4), 0.0, 1.0);
+				glFogf(GL_FOG_START, d);
+				glFogf(GL_FOG_END, d*(1 + (LLViewerCamera::getInstance()->getView() / LLViewerCamera::getInstance()->getDefaultFOV())));
+				glFogfv(GL_FOG_COLOR, fogCol.mV);
+			// <FS:Ansariel> Don't use fixed functions when using shader renderer; found by Drake Arconis
+			}
+			// </FS:Ansariel>
 
 			gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT);
 			{
@@ -6613,13 +6620,20 @@ void LLSelectNode::renderOneSilhouette(const LLColor4 &aColor)
 		{
 			gGL.flush();
 			gGL.blendFunc(LLRender::BF_SOURCE_COLOR, LLRender::BF_ONE);
-			LLGLEnable fog(GL_FOG);
-			glFogi(GL_FOG_MODE, GL_LINEAR);
-			float d = (LLViewerCamera::getInstance()->getPointOfInterest()-LLViewerCamera::getInstance()->getOrigin()).magVec();
-			LLColor4 fogCol = color * (F32)llclamp((LLSelectMgr::getInstance()->getSelectionCenterGlobal()-gAgentCamera.getCameraPositionGlobal()).magVec()/(LLSelectMgr::getInstance()->getBBoxOfSelection().getExtentLocal().magVec()*4), 0.0, 1.0);
-			glFogf(GL_FOG_START, d);
-			glFogf(GL_FOG_END, d*(1 + (LLViewerCamera::getInstance()->getView() / LLViewerCamera::getInstance()->getDefaultFOV())));
-			glFogfv(GL_FOG_COLOR, fogCol.mV);
+			// <FS:Ansariel> Don't use fixed functions when using shader renderer; found by Drake Arconis
+			if (!LLGLSLShader::sNoFixedFunction)
+			{
+			// </FS:Ansariel>
+				LLGLEnable fog(GL_FOG);
+				glFogi(GL_FOG_MODE, GL_LINEAR);
+				float d = (LLViewerCamera::getInstance()->getPointOfInterest()-LLViewerCamera::getInstance()->getOrigin()).magVec();
+				LLColor4 fogCol = color * (F32)llclamp((LLSelectMgr::getInstance()->getSelectionCenterGlobal()-gAgentCamera.getCameraPositionGlobal()).magVec()/(LLSelectMgr::getInstance()->getBBoxOfSelection().getExtentLocal().magVec()*4), 0.0, 1.0);
+				glFogf(GL_FOG_START, d);
+				glFogf(GL_FOG_END, d*(1 + (LLViewerCamera::getInstance()->getView() / LLViewerCamera::getInstance()->getDefaultFOV())));
+				glFogfv(GL_FOG_COLOR, fogCol.mV);
+			// <FS:Ansariel> Don't use fixed functions when using shader renderer; found by Drake Arconis
+			}
+			// </FS:Ansariel>
 
 			LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE, GL_GEQUAL);
 			gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT);