diff options
author | Dave Parks <davep@lindenlab.com> | 2011-09-30 12:42:30 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-09-30 12:42:30 -0500 |
commit | 4ff4d99c4751b905c12ab56289b63e39ef6269de (patch) | |
tree | 59888efb5f650b0a06ad70cfc296d93b90a1654b /indra/newview/llagent.cpp | |
parent | f7ddde3807a3437cc036e687d216ef69feb6214b (diff) | |
parent | 8c1f8c77469a3b1dbc66f56f8722c0c01fdddf8a (diff) |
merge
Diffstat (limited to 'indra/newview/llagent.cpp')
-rwxr-xr-x | indra/newview/llagent.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 296ae8f10b..476ffc8ee9 100755 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -3922,14 +3922,14 @@ void LLAgent::renderAutoPilotTarget() F32 height_meters; LLVector3d target_global; - glMatrixMode(GL_MODELVIEW); + gGL.matrixMode(LLRender::MM_MODELVIEW); gGL.pushMatrix(); // not textured gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); // lovely green - glColor4f(0.f, 1.f, 1.f, 1.f); + gGL.color4f(0.f, 1.f, 1.f, 1.f); target_global = mAutoPilotTargetGlobal; @@ -3937,9 +3937,9 @@ void LLAgent::renderAutoPilotTarget() height_meters = 1.f; - glScalef(height_meters, height_meters, height_meters); + gGL.scalef(height_meters, height_meters, height_meters); - gSphere.render(1500.f); + gSphere.render(); gGL.popMatrix(); } |