diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-09-29 22:46:43 +0000 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-09-29 22:46:43 +0000 |
| commit | 18ddd70d96dc572ad94c81f9a1a3d08d7c7cdbc7 (patch) | |
| tree | 529ce1546477d9620c18095ab73e54bbd7ea8d90 /indra/newview/llface.cpp | |
| parent | 7781e1417e5a747a501e76ee9e976226a2656b6a (diff) | |
| parent | eb6c8c937e214f58cc4da48bd4db455315de4c20 (diff) | |
Merged in DV510-merge-6.4.10 (pull request #322)
Merge master v 6.4.10 to DRTVWR-510
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); } |