diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-10-24 17:15:41 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-10-24 17:18:52 +0300 |
| commit | 683bfcfdee76d34126810c181ca877afa1deb2b1 (patch) | |
| tree | 9939dbe20b046abd5fff0e86ed3cbd23b9ef4839 /indra | |
| parent | 5b5d24a74703d2a8d5da65ef57d9b8af6889e3d7 (diff) | |
SL-17021 Fix some changes vanishing over merge to D559 #2
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 84158c3a7d..cb58c173d9 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -4848,7 +4848,9 @@ BOOL LLVOVolume::lineSegmentIntersect(const LLVector4a& start, const LLVector4a& continue; } - updateRiggedVolume(true, i); + // This calculates the bounding box of the skinned mesh from scratch. It's actually quite expensive, but not nearly as expensive as building a full octree. + // rebuild_face_octrees = false because an octree for this face will be built later only if needed for narrow phase picking. + updateRiggedVolume(true, i, false); face_hit = volume->lineSegmentIntersect(local_start, local_end, i, &p, &tc, &n, &tn); @@ -4978,7 +4980,7 @@ void LLVOVolume::updateRiggedVolume(bool force_treat_as_rigged, LLRiggedVolume:: //Update mRiggedVolume to match current animation frame of avatar. //Also update position/size in octree. - if ((!force_update) && (!treatAsRigged())) + if ((!force_treat_as_rigged) && (!treatAsRigged())) { clearRiggedVolume(); |