diff options
author | Dave Parks <davep@lindenlab.com> | 2011-10-19 16:21:18 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-10-19 16:21:18 -0500 |
commit | f19f43c74606e1f158cdabe9e783f9c82386b7b7 (patch) | |
tree | 64c1a6d7d1d8a1ae0b30baf6bd519d8140136971 /indra/newview/llagent.cpp | |
parent | dd61baa3401a09bd8ff1e894514c15390946cdb3 (diff) | |
parent | 4ec72ed0a61157dd5fcc1bc4cc91054664ee75b5 (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 773e20eda7..b0607f3510 100755 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -4001,14 +4001,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; @@ -4016,9 +4016,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(); } |