diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-09-20 09:48:55 -0400 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-09-20 09:48:55 -0400 |
| commit | cf98064700a736f73a6c21ce899b186919cbeb64 (patch) | |
| tree | 30f222c22fe07c2a04c047a27e542b53075507e9 /indra/newview/llface.cpp | |
| parent | f80d16808d21eaa9a3e8550284d25a43e2669ae2 (diff) | |
reapply 52b6c9168974: MAINT-646 Factor std::set out of lloctree
Diffstat (limited to 'indra/newview/llface.cpp')
| -rwxr-xr-x | indra/newview/llface.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index 02a8d1244f..eea5161538 100755 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -163,15 +163,10 @@ void LLFace::init(LLDrawable* drawablep, LLViewerObject* objp) mGeomCount = 0; mGeomIndex = 0; mIndicesCount = 0; - if (drawablep->getRenderType() == LLPipeline::RENDER_TYPE_PARTICLES || - drawablep->getRenderType() == LLPipeline::RENDER_TYPE_HUD_PARTICLES) - { //indicate to LLParticlePartition that this particle is uninitialized - mIndicesIndex = 0xFFFFFFFF; - } - else - { - mIndicesIndex = 0; - } + + //special value to indicate uninitialized position + mIndicesIndex = 0xFFFFFFFF; + mIndexInTex = 0; mTexture = NULL; mTEOffset = -1; |