diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-08-10 13:01:14 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-08-10 13:01:14 -0500 |
| commit | 2ee815478043c4d5845f094f744a055707dba0e0 (patch) | |
| tree | 7a34bf2b60eaf609af9f3e8dab20268ed720d75c /indra/newview/lltracker.cpp | |
| parent | f076bdf609ec1fe114a7d0222a318483c97c7a26 (diff) | |
SH-2238, SH-2223, SH-SH-2242 glVertexAttrib throughout main render pipeline complete, preview renders and debug displays still pending. Also fixed a render glitch and a crash (JIRAs listed).
Diffstat (limited to 'indra/newview/lltracker.cpp')
| -rw-r--r-- | indra/newview/lltracker.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/lltracker.cpp b/indra/newview/lltracker.cpp index 983108391f..2ec7534025 100644 --- a/indra/newview/lltracker.cpp +++ b/indra/newview/lltracker.cpp @@ -506,7 +506,8 @@ void LLTracker::renderBeacon(LLVector3d pos_global, glMatrixMode(GL_MODELVIEW); - glPushMatrix(); + gGL.pushMatrix(); + { glTranslatef(pos_agent.mV[0], pos_agent.mV[1], pos_agent.mV[2]); draw_shockwave(1024.f, gRenderStartTime.getElapsedTimeF32(), 32, fogged_color); @@ -559,9 +560,8 @@ void LLTracker::renderBeacon(LLVector3d pos_global, gGL.end(); } - - //gCylinder.render(1000); - glPopMatrix(); + } + gGL.popMatrix(); std::string text; text = llformat( "%.0f m", to_vec.magVec()); |