diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-09-14 16:57:42 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-09-14 16:57:42 -0500 |
| commit | 4e006b0e3891d5728a6753059f2c5afc77737482 (patch) | |
| tree | 96af37ac252d823f8dc51e20546848ad464e0274 /indra/newview/lltracker.cpp | |
| parent | 758b936deaa0e6ea397c49afa5024315415eeb93 (diff) | |
| parent | c0ca2c62fd6b9a90542907ce46bf1fe0ab379e13 (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()); |