diff options
| author | Nat Linden <nat@lindenlab.com> | 2022-09-19 21:21:21 +0000 |
|---|---|---|
| committer | Nat Linden <nat@lindenlab.com> | 2022-09-19 21:21:21 +0000 |
| commit | 9ac0b3da77ca0c54161803f23cc37c09e871799d (patch) | |
| tree | ec9575c248d6e9cd01d8d15471ceb952c7dba738 /indra/newview/llvovolume.cpp | |
| parent | 5f1c8d311904bd3937f5ba70476e16233f7d21c1 (diff) | |
| parent | f39be1dfd30032f10f21cccc29e93c1c49f01df5 (diff) | |
SL-18068: Merged DRTVWR-565-maint-P into sl-18068
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index f4a938e57d..cf633d2146 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -6014,7 +6014,7 @@ void LLVolumeGeometryManager::rebuildMesh(LLSpatialGroup* group) { LLDrawable* drawablep = (LLDrawable*)(*drawable_iter)->getDrawable(); - if (drawablep && !drawablep->isDead() && drawablep->isState(LLDrawable::REBUILD_ALL) && !drawablep->isState(LLDrawable::RIGGED) ) + if (drawablep && !drawablep->isDead() && drawablep->isState(LLDrawable::REBUILD_ALL)) { LLVOVolume* vobj = drawablep->getVOVolume(); @@ -6048,8 +6048,6 @@ void LLVolumeGeometryManager::rebuildMesh(LLSpatialGroup* group) LLVertexBuffer* buff = face->getVertexBuffer(); if (buff) { - llassert(!face->isState(LLFace::RIGGED)); - if (!face->getGeometryVolume(*volume, face->getTEOffset(), vobj->getRelativeXform(), vobj->getRelativeXformInvTrans(), face->getGeomIndex())) { //something's gone wrong with the vertex buffer accounting, rebuild this group |