Merge pull request #6193 from secondlife/release/26.4

Release/26.4

1 files changed, 5 insertions, 7 deletions

diff --git a/indra/newview/llglsandbox.cpp b/indra/newview/llglsandbox.cpp
index 5484ce6276..41d7d93528 100644
--- a/indra/newview/llglsandbox.cpp
+++ b/indra/newview/llglsandbox.cpp
@@ -728,8 +728,7 @@ void LLViewerObjectList::renderObjectBeacons()
             S32 line_width = debug_beacon.mLineWidth;
             if (line_width != last_line_width)
             {
-                gGL.flush();
-                glLineWidth( (F32)line_width );
+                gGL.setLineWidth( (F32)line_width );
                 last_line_width = line_width;
             }
 
@@ -758,8 +757,7 @@ void LLViewerObjectList::renderObjectBeacons()
             S32 line_width = debug_beacon.mLineWidth;
             if (line_width != last_line_width)
             {
-                gGL.flush();
-                glLineWidth( (F32)line_width );
+                gGL.setLineWidth( (F32)line_width );
                 last_line_width = line_width;
             }
 
@@ -773,7 +771,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)
         {
@@ -808,7 +806,7 @@ void LLSky::renderSunMoonBeacons(const LLVector3& pos_agent, const LLVector3& di
     {
         pos_end.mV[i] = pos_agent.mV[i] + (50 * direction.mV[i]);
     }
-    glLineWidth((GLfloat)LLPipeline::DebugBeaconLineWidth);
+    gGL.setLineWidth((GLfloat)LLPipeline::DebugBeaconLineWidth);
     gGL.begin(LLRender::LINES);
     color.mV[3] *= 0.5f;
     gGL.color4fv(color.mV);
@@ -819,7 +817,7 @@ void LLSky::renderSunMoonBeacons(const LLVector3& pos_agent, const LLVector3& di
     gGL.end();
 
     gGL.flush();
-    glLineWidth(1.f);
+    gGL.setLineWidth(1.f);
 
 }