diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-12-13 17:36:29 -0500 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-12-13 17:36:29 -0500 |
commit | e4f1f611a4736e4b0b78c0d61c3c5f576fec93d0 (patch) | |
tree | 87aeed34bc9378648e1b8729bacf8462b4d9ec2d /indra/newview/llhudeffectbeam.cpp | |
parent | 20bc02d2544320a5ad99c61b8d012608319e3161 (diff) | |
parent | d8aa31d10a89aa826cc549594c083a054a2ad967 (diff) |
merged .hgtags
Diffstat (limited to 'indra/newview/llhudeffectbeam.cpp')
-rw-r--r-- | indra/newview/llhudeffectbeam.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llhudeffectbeam.cpp b/indra/newview/llhudeffectbeam.cpp index 37b7b2e75d..8abad3d292 100644 --- a/indra/newview/llhudeffectbeam.cpp +++ b/indra/newview/llhudeffectbeam.cpp @@ -295,13 +295,13 @@ void LLHUDEffectBeam::render() F32 alpha = mFadeInterp.getCurVal()*mColor.mV[3]; alpha *= mInterpFade[i].getCurVal(); coloru.mV[3] = (U8)alpha; - glColor4ubv(coloru.mV); + gGL.color4ubv(coloru.mV); - glPushMatrix(); - glTranslatef(pos_agent.mV[0], pos_agent.mV[1], pos_agent.mV[2]); - glScalef(scale, scale, scale); - gSphere.render(0); - glPopMatrix(); + gGL.pushMatrix(); + gGL.translatef(pos_agent.mV[0], pos_agent.mV[1], pos_agent.mV[2]); + gGL.scalef(scale, scale, scale); + gSphere.render(); + gGL.popMatrix(); } } |