summaryrefslogtreecommitdiff
path: root/indra/newview/llworldmapview.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-11-08 15:28:13 -0600
committerDave Parks <davep@lindenlab.com>2011-11-08 15:28:13 -0600
commit0d568ce9f0522eaa21a12fa5fae31f80c59bd947 (patch)
tree6b849a3b48a35feaeff0278ca8e562359df852e2 /indra/newview/llworldmapview.cpp
parent28c26cb491305525fb3f24ec2ef3bcb9b1ab8c5f (diff)
parentef8bdb5d95ebd869279ee4bb0510d54e51ab747f (diff)
merge
Diffstat (limited to 'indra/newview/llworldmapview.cpp')
-rw-r--r--indra/newview/llworldmapview.cpp4
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);