aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llmanipscale.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llmanipscale.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/linden/indra/newview/llmanipscale.cpp b/linden/indra/newview/llmanipscale.cpp
index 86bfba9..bb26484 100644
--- a/linden/indra/newview/llmanipscale.cpp
+++ b/linden/indra/newview/llmanipscale.cpp
@@ -600,7 +600,7 @@ void LLManipScale::renderFaces( const LLBBox& bbox )
600 { 600 {
601 gGL.color4fv( default_normal_color.mV ); 601 gGL.color4fv( default_normal_color.mV );
602 LLGLDepthTest gls_depth(GL_FALSE); 602 LLGLDepthTest gls_depth(GL_FALSE);
603 gGL.begin(GL_QUADS); 603 gGL.begin(LLVertexBuffer::QUADS);
604 { 604 {
605 // Face 0 605 // Face 0
606 gGL.vertex3f(min.mV[VX], max.mV[VY], max.mV[VZ]); 606 gGL.vertex3f(min.mV[VX], max.mV[VY], max.mV[VZ]);
@@ -1534,7 +1534,7 @@ void LLManipScale::renderSnapGuides(const LLBBox& bbox)
1534 { 1534 {
1535 LLColor4 tick_color = setupSnapGuideRenderPass(pass); 1535 LLColor4 tick_color = setupSnapGuideRenderPass(pass);
1536 1536
1537 gGL.begin(GL_LINES); 1537 gGL.begin(LLVertexBuffer::LINES);
1538 LLVector3 line_mid = mScaleCenter + (mScaleSnapValue * mScaleDir) + (mSnapGuideDir1 * mSnapRegimeOffset); 1538 LLVector3 line_mid = mScaleCenter + (mScaleSnapValue * mScaleDir) + (mSnapGuideDir1 * mSnapRegimeOffset);
1539 LLVector3 line_start = line_mid - (mScaleDir * (llmin(mScaleSnapValue, mSnapGuideLength * 0.5f))); 1539 LLVector3 line_start = line_mid - (mScaleDir * (llmin(mScaleSnapValue, mSnapGuideLength * 0.5f)));
1540 LLVector3 line_end = line_mid + (mScaleDir * llmin(max_point_on_scale_line - mScaleSnapValue, mSnapGuideLength * 0.5f)); 1540 LLVector3 line_end = line_mid + (mScaleDir * llmin(max_point_on_scale_line - mScaleSnapValue, mSnapGuideLength * 0.5f));
@@ -1585,7 +1585,7 @@ void LLManipScale::renderSnapGuides(const LLBBox& bbox)
1585 if (mInSnapRegime) 1585 if (mInSnapRegime)
1586 { 1586 {
1587 // draw snap guide line 1587 // draw snap guide line
1588 gGL.begin(GL_LINES); 1588 gGL.begin(LLVertexBuffer::LINES);
1589 LLVector3 snap_line_center = mScaleCenter + (mScaleSnapValue * mScaleDir); 1589 LLVector3 snap_line_center = mScaleCenter + (mScaleSnapValue * mScaleDir);
1590 1590
1591 LLVector3 snap_line_start = snap_line_center + (mSnapGuideDir1 * mSnapRegimeOffset); 1591 LLVector3 snap_line_start = snap_line_center + (mSnapGuideDir1 * mSnapRegimeOffset);
@@ -1599,7 +1599,7 @@ void LLManipScale::renderSnapGuides(const LLBBox& bbox)
1599 gGL.end(); 1599 gGL.end();
1600 1600
1601 // draw snap guide arrow 1601 // draw snap guide arrow
1602 gGL.begin(GL_TRIANGLES); 1602 gGL.begin(LLVertexBuffer::TRIANGLES);
1603 { 1603 {
1604 //gGLSNoCullFaces.set(); 1604 //gGLSNoCullFaces.set();
1605 gGL.color4f(1.f, 1.f, 1.f, grid_alpha); 1605 gGL.color4f(1.f, 1.f, 1.f, grid_alpha);
@@ -1634,7 +1634,7 @@ void LLManipScale::renderSnapGuides(const LLBBox& bbox)
1634 start_tick = -(llmin(ticks_from_scale_center_1, num_ticks_per_side1)); 1634 start_tick = -(llmin(ticks_from_scale_center_1, num_ticks_per_side1));
1635 stop_tick = llmin(max_ticks1, num_ticks_per_side1); 1635 stop_tick = llmin(max_ticks1, num_ticks_per_side1);
1636 1636
1637 gGL.begin(GL_LINES); 1637 gGL.begin(LLVertexBuffer::LINES);
1638 // draw first row of ticks 1638 // draw first row of ticks
1639 for (S32 i = start_tick; i <= stop_tick; i++) 1639 for (S32 i = start_tick; i <= stop_tick; i++)
1640 { 1640 {