diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-08-11 14:20:57 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-08-11 14:20:57 -0500 |
| commit | 80398b3ccb0c4a6ff3ac20b3565619fe5cecc2f9 (patch) | |
| tree | 623156a93d159ece460a31590701d7cbdc701cdc /indra/newview/lltracker.cpp | |
| parent | 610764fbfce75f54c95d4b10c2a8f9482a7a7b80 (diff) | |
| parent | 2dd8ce53e4e0d14f2bc20796eb6bdf1ef12a65df (diff) | |
merge
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()); |