diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-06-15 16:07:06 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-06-15 16:07:06 -0500 |
| commit | a1d0d67e05c45bdc1a7a8bb0aad79772a2a94f6e (patch) | |
| tree | 2a35cd0bfc9749122bb48636c1738752710efada /indra/newview/llface.cpp | |
| parent | 99dc246ac843114f20f7aa99531451fcf46df3ed (diff) | |
MAINT-775 Fix for particle index pool corruption on teleport.
Diffstat (limited to 'indra/newview/llface.cpp')
| -rw-r--r-- | 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 9acdee702b..f5b217d539 100644 --- 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) |