diff options
| author | Palmer <palmer@lindenlab.com> | 2010-06-01 15:47:16 -0700 |
|---|---|---|
| committer | Palmer <palmer@lindenlab.com> | 2010-06-01 15:47:16 -0700 |
| commit | b6250ac93afb61fcba9848b1516631af8fe53bc6 (patch) | |
| tree | 3e04119a0bd7fca4f3cf7b3e28fcf5fdc09cb0c3 /indra/newview | |
| parent | 8cca0d209ff9bd8527d1bc3822852684e5c4b684 (diff) | |
| parent | 9a832999d9567da7e39eb37b04557bbd3ec0c098 (diff) | |
Merge for EXT-7588 (jira wasn't listed in qarl's commit), for making unloaded avatar sphere fullbright/no flicker
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/lldrawpoolavatar.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp index 546b60f286..2d0859650a 100644 --- a/indra/newview/lldrawpoolavatar.cpp +++ b/indra/newview/lldrawpoolavatar.cpp @@ -634,7 +634,7 @@ void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, S32 pass) if (!single_avatar && !avatarp->isFullyLoaded() ) { - if (pass==1 && (!gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_PARTICLES) || LLViewerPartSim::getMaxPartCount() <= 0)) + if (pass==0 && (!gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_PARTICLES) || LLViewerPartSim::getMaxPartCount() <= 0)) { // debug code to draw a sphere in place of avatar gGL.getTexUnit(0)->bind(LLViewerFetchedTexture::sWhiteImagep); @@ -646,8 +646,10 @@ void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, S32 pass) gGL.translatef((F32)(pos.mV[VX]), (F32)(pos.mV[VY]), (F32)(pos.mV[VZ])); - gGL.scalef(0.15f, 0.15f, 0.3f); - gSphere.render(); + gGL.scalef(0.15f, 0.15f, 0.3f); + + gSphere.renderGGL(); + gGL.popMatrix(); gGL.setColorMask(true, false); } |