diff options
author | Dave Parks <davep@lindenlab.com> | 2011-10-05 19:18:58 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-10-05 19:18:58 -0500 |
commit | 1f4bc180502d1a4448e18715596a61ae9f406c4f (patch) | |
tree | 009f70b9f3d27ce28571d0f056a169497bb74b9f /indra/newview/llworldmapview.cpp | |
parent | 194bedbb96a6dcfe90d5b731aeca8658c83f2306 (diff) | |
parent | 2b51a7a60942b1efc99cee43489ef2f92fa7a188 (diff) |
merge
Diffstat (limited to 'indra/newview/llworldmapview.cpp')
-rw-r--r-- | indra/newview/llworldmapview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llworldmapview.cpp b/indra/newview/llworldmapview.cpp index 265d5dc801..3959e7c073 100644 --- a/indra/newview/llworldmapview.cpp +++ b/indra/newview/llworldmapview.cpp @@ -314,7 +314,7 @@ void LLWorldMapView::draw() { gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); - glMatrixMode(GL_MODELVIEW); + gGL.matrixMode(LLRender::MM_MODELVIEW); // Clear the background alpha to 0 gGL.flush(); @@ -1307,7 +1307,7 @@ void LLWorldMapView::drawTrackingCircle( const LLRect& rect, S32 x, S32 y, const end_theta -= angle_adjust_y; } - glMatrixMode(GL_MODELVIEW); + gGL.matrixMode(LLRender::MM_MODELVIEW); gGL.pushMatrix(); gGL.translatef((F32)x, (F32)y, 0.f); gl_washer_segment_2d(inner_radius, outer_radius, start_theta, end_theta, 40, color, color); |