diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-09-20 10:00:58 -0400 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-09-20 10:00:58 -0400 |
| commit | 7fc702dc4930445b87dc2cd1d52c0cc64295f26c (patch) | |
| tree | 87674607fb652ac2334023997060c842a20cb3b3 /indra/newview/llface.cpp | |
| parent | 60cf43bad98d620f6024c9fe3f0b48aeecad2de7 (diff) | |
reapply 04fdf7945708: MAINT-775 Fix for particle index pool corruption on teleport.
Diffstat (limited to 'indra/newview/llface.cpp')
| -rwxr-xr-x | indra/newview/llface.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index 2074cb6514..582f06eeb0 100755 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -202,13 +202,10 @@ void LLFace::destroy() mTexture->removeFace(this) ; } - if (mDrawablep.notNull() && - (mDrawablep->getRenderType() == LLPipeline::RENDER_TYPE_PARTICLES || - mDrawablep->getRenderType() == LLPipeline::RENDER_TYPE_HUD_PARTICLES) && - mIndicesIndex != 0xFFFFFFFF) + if (isState(LLFace::PARTICLE)) { LLVOPartGroup::freeVBSlot(getGeomIndex()/4); - mIndicesIndex = 0xFFFFFFFF; + clearState(LLFace::PARTICLE); } if (mDrawPoolp) |