diff options
author | Dave Parks <davep@lindenlab.com> | 2011-10-20 18:56:43 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-10-20 18:56:43 -0500 |
commit | 492f820c6b8a164cb201fed232e40e743e8e38c4 (patch) | |
tree | 7d360ddc2ff2288d1ec8163b6215cf9c81031b51 /indra/newview/llworldmapview.cpp | |
parent | 1c58b3b18ea732e0032e70ae6dc9c8ec2f2834b4 (diff) | |
parent | 34c01b6b1ff758463dcdff19782e5af668699304 (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); |