diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-09-28 21:21:13 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-09-28 21:21:13 +0300 |
| commit | 42fa322e76757073ecc8e884f7fd0fb80e0dd4ad (patch) | |
| tree | 7be5fd8cdbaef3a6b27893a9a3aa33a6d6fe846e /indra/newview/llface.cpp | |
| parent | c2b55c4362111c124df30eb339461486bda32ec9 (diff) | |
| parent | bac6652cdcd2d8333df04c3ebd3a6a7b752328b3 (diff) | |
Merged master (DRTVWR-497) into DRTVWR-514-keymappings
Diffstat (limited to 'indra/newview/llface.cpp')
| -rw-r--r-- | indra/newview/llface.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index 36832d85fd..4a802ad9aa 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -196,7 +196,7 @@ void LLFace::destroy() if (mDrawPoolp) { - if (this->isState(LLFace::RIGGED) && mDrawPoolp->getType() == LLDrawPool::POOL_AVATAR) + if (this->isState(LLFace::RIGGED) && (mDrawPoolp->getType() == LLDrawPool::POOL_CONTROL_AV || mDrawPoolp->getType() == LLDrawPool::POOL_AVATAR)) { ((LLDrawPoolAvatar*) mDrawPoolp)->removeRiggedFace(this); } |