diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-12-06 11:30:27 -0500 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-12-06 11:30:27 -0500 |
commit | 97a92deb18d09e030c0800107204d9776a3c6229 (patch) | |
tree | 16133351b0822937c5da1e7009e80e3157119d59 /indra/newview/llworldmapview.cpp | |
parent | ae2a1ea9f10dc9bf3cc5ef59f1428ea1e5fa6495 (diff) | |
parent | 95850eddfd26e85dcfa1dd6f71233b6e0bf08253 (diff) |
reconciled .hgtags
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 e99657cd22..e50851b8e7 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); |