diff options
author | Dave Parks <davep@lindenlab.com> | 2011-10-24 15:32:58 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-10-24 15:32:58 -0500 |
commit | e2b52009ea509ec67341df196f3ad629869493e1 (patch) | |
tree | 65089b4903f6169f46333156d965609735f0a3dd /indra/newview/llagent.cpp | |
parent | 8d410326c937a375fa0eb7855678e590499a79d2 (diff) | |
parent | 7b83f1dfd1daeb4e0b80e1c369e83137682a723c (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 f8b204eca0..30573928a4 100755 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -4004,14 +4004,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; @@ -4019,9 +4019,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(); } |