diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-04 09:17:26 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-04 09:17:26 +0100 |
| commit | 722c8af1121f3edbcef6c5478c31339177fac802 (patch) | |
| tree | 10eb16a768057a7d175203fa82e6caf0c816492f /indra/newview/llface.cpp | |
| parent | 29e98032d1ad86686bee0fd58c65f95d1aeba439 (diff) | |
| parent | eb283701afc7ecbe3009a9fb75be1dcb222a383b (diff) | |
merge
Diffstat (limited to 'indra/newview/llface.cpp')
| -rw-r--r-- | indra/newview/llface.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index 7866e49bae..9df692e787 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -41,6 +41,7 @@ #include "m3math.h" #include "v3color.h" +#include "lldrawpoolavatar.h" #include "lldrawpoolbump.h" #include "llgl.h" #include "llrender.h" @@ -205,7 +206,16 @@ void LLFace::destroy() if (mDrawPoolp) { LLFastTimer t(FTM_DESTROY_DRAWPOOL); - mDrawPoolp->removeFace(this); + + if (this->isState(LLFace::RIGGED) && mDrawPoolp->getType() == LLDrawPool::POOL_AVATAR) + { + ((LLDrawPoolAvatar*) mDrawPoolp)->removeRiggedFace(this); + } + else + { + mDrawPoolp->removeFace(this); + } + mDrawPoolp = NULL; } |