diff options
| author | Cosmic Linden <cosmic@lindenlab.com> | 2022-07-22 13:45:00 -0700 |
|---|---|---|
| committer | Cosmic Linden <cosmic@lindenlab.com> | 2022-07-26 10:40:19 -0700 |
| commit | f1128da8da714b9d036fe1dbc66cf46ccf7747a5 (patch) | |
| tree | 2d5987293627ae44802796a06834b9d197e4aaba /indra/llmath/llvolume.h | |
| parent | bb318110efaa7161015be4228d985e49aefec8f8 (diff) | |
SL-17801: Use raw array for mOctreeTriangles to avoid memory alignment issues, increasing risk of crashes during picking due to SIMD operations
Diffstat (limited to 'indra/llmath/llvolume.h')
| -rw-r--r-- | indra/llmath/llvolume.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llmath/llvolume.h b/indra/llmath/llvolume.h index da155c7b41..ffb02b934d 100644 --- a/indra/llmath/llvolume.h +++ b/indra/llmath/llvolume.h @@ -977,12 +977,13 @@ public: // This octree stores raw pointer references to triangles in mOctreeTriangles LLOctreeNode<LLVolumeTriangle, LLVolumeTriangle*>* mOctree; - std::vector<LLVolumeTriangle> mOctreeTriangles; //whether or not face has been cache optimized BOOL mOptimized; private: + LLVolumeTriangle* mOctreeTriangles; + BOOL createUnCutCubeCap(LLVolume* volume, BOOL partial_build = FALSE); BOOL createCap(LLVolume* volume, BOOL partial_build = FALSE); BOOL createSide(LLVolume* volume, BOOL partial_build = FALSE); |