diff --git a/indra/newview/llglsandbox.cpp b/indra/newview/llglsandbox.cpp
index 852dc07efe749e6dcdf448d14226174ac2464864..d4f3ba4773f47e3b7b80975408dd1c81f8172d2e 100644
--- a/indra/newview/llglsandbox.cpp
+++ b/indra/newview/llglsandbox.cpp
@@ -858,7 +858,7 @@ void LLViewerObjectList::renderObjectBeacons()
 			if (line_width != last_line_width)
 			{
 				gGL.flush();
-				glLineWidth( (F32)line_width );
+				gGL.setLineWidth( (F32)line_width );
 				last_line_width = line_width;
 			}
 
@@ -888,7 +888,7 @@ void LLViewerObjectList::renderObjectBeacons()
 			if (line_width != last_line_width)
 			{
 				gGL.flush();
-				glLineWidth( (F32)line_width );
+				gGL.setLineWidth( (F32)line_width );
 				last_line_width = line_width;
 			}
 
@@ -902,7 +902,7 @@ void LLViewerObjectList::renderObjectBeacons()
 		}
 		
 		gGL.flush();
-		glLineWidth(1.f);
+		gGL.setLineWidth(1.f);
 
 		for (std::vector<LLDebugBeacon>::iterator iter = mDebugBeacons.begin(); iter != mDebugBeacons.end(); ++iter)
 		{
@@ -940,7 +940,7 @@ void LLSky::renderSunMoonBeacons(const LLVector3& pos_agent, const LLVector3& di
 	{
 		pos_end.mV[i] = pos_agent.mV[i] + (50 * direction.mV[i]);
 	}
-	glLineWidth(LLPipeline::DebugBeaconLineWidth);
+	gGL.setLineWidth(LLPipeline::DebugBeaconLineWidth);
 	gGL.begin(LLRender::LINES);
 	color.mV[3] *= 0.5f;
 	gGL.color4fv(color.mV);
@@ -951,7 +951,7 @@ void LLSky::renderSunMoonBeacons(const LLVector3& pos_agent, const LLVector3& di
 	gGL.end();
 
 	gGL.flush();
-	glLineWidth(1.f);
+	gGL.setLineWidth(1.f);
 
 }
 
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index cd28a6703fdd5b20ab8e2c87d77252f15ce98bcb..34d47006c9fb82707587eeb03838b5f47682849a 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -4963,7 +4963,7 @@ void LLPipeline::renderDebug()
 					if ( pathfindingConsole->isRenderNavMesh() )
 					{	
 						gGL.flush();
-						glLineWidth(2.0f);	
+						gGL.setLineWidth(2.0f);	
 						LLGLEnable cull(GL_CULL_FACE);
 						LLGLDisable blend(GL_BLEND);
 						
@@ -4994,7 +4994,7 @@ void LLPipeline::renderDebug()
 
 						gGL.flush();
 						glPolygonMode( GL_FRONT_AND_BACK, GL_FILL );	
-						glLineWidth(1.0f);	
+						gGL.setLineWidth(1.0f);	
 						gGL.flush();
 					}
 					//User designated path
@@ -5131,11 +5131,11 @@ void LLPipeline::renderDebug()
 									gPathfindingProgram.uniform1f(sTint, 1.f);
 									gPathfindingProgram.uniform1f(sAlphaScale, 1.f);
 
-									glLineWidth(gSavedSettings.getF32("PathfindingLineWidth"));
+									gGL.setLineWidth(gSavedSettings.getF32("PathfindingLineWidth"));
 									LLGLDisable blendOut(GL_BLEND);
 									llPathingLibInstance->renderNavMeshShapesVBO( render_order[i] );				
 									gGL.flush();
-									glLineWidth(1.f);
+									gGL.setLineWidth(1.f);
 								}
 				
 								glPolygonMode( GL_FRONT_AND_BACK, GL_FILL );
@@ -5158,7 +5158,7 @@ void LLPipeline::renderDebug()
 						LLGLEnable blend(GL_BLEND);
 						LLGLDepthTest depth(GL_TRUE, GL_FALSE, GL_GREATER);
 						gGL.flush();				
-						glLineWidth(2.0f);	
+						gGL.setLineWidth(2.0f);	
 						LLGLEnable cull(GL_CULL_FACE);
 																		
 						gPathfindingProgram.uniform1f(sTint, gSavedSettings.getF32("PathfindingXRayTint"));
@@ -5192,7 +5192,7 @@ void LLPipeline::renderDebug()
 						}
 					
 						gGL.flush();
-						glLineWidth(1.0f);	
+						gGL.setLineWidth(1.0f);	
 					}
 			
 					glPolygonOffset(0.f, 0.f);
@@ -5455,7 +5455,7 @@ void LLPipeline::renderDebug()
 			}
 
 			/*gGL.flush();
-			glLineWidth(16-i*2);
+			gGL.setLineWidth(16-i*2);
 			for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
 					iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
 			{
@@ -5473,7 +5473,7 @@ void LLPipeline::renderDebug()
 				}
 			}
 			gGL.flush();
-			glLineWidth(1.f);*/
+			gGL.setLineWidth(1.f);*/
 		}
 	}