diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-11-21 03:25:22 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-11-21 03:25:22 -0600 |
| commit | 81ba8b8bc61addcb77e4f6d7d637a3401de295bd (patch) | |
| tree | ee32d4212c48ca99d7398fe6d47d30448efa0ef1 | |
| parent | c149a0020bfc6983e7ce7a2426f324a6b8e75495 (diff) | |
Get rid of more ll_aligned_malloc calls.
| -rw-r--r-- | indra/llmath/llvolumeoctree.cpp | 5 | ||||
| -rw-r--r-- | indra/llmath/llvolumeoctree.h | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/indra/llmath/llvolumeoctree.cpp b/indra/llmath/llvolumeoctree.cpp index cc97026ad4..b5a935c2b5 100644 --- a/indra/llmath/llvolumeoctree.cpp +++ b/indra/llmath/llvolumeoctree.cpp @@ -78,14 +78,11 @@ BOOL LLLineSegmentBoxIntersect(const LLVector4a& start, const LLVector4a& end, c LLVolumeOctreeListener::LLVolumeOctreeListener(LLOctreeNode<LLVolumeTriangle>* node) { node->addListener(this); - - mBounds = (LLVector4a*) ll_aligned_malloc_16(sizeof(LLVector4a)*4); - mExtents = mBounds+2; } LLVolumeOctreeListener::~LLVolumeOctreeListener() { - ll_aligned_free_16(mBounds); + } void LLVolumeOctreeListener::handleChildAddition(const LLOctreeNode<LLVolumeTriangle>* parent, diff --git a/indra/llmath/llvolumeoctree.h b/indra/llmath/llvolumeoctree.h index 63240ba022..f696cbd976 100644 --- a/indra/llmath/llvolumeoctree.h +++ b/indra/llmath/llvolumeoctree.h @@ -64,8 +64,8 @@ public: public: - LLVector4a* mBounds; // bounding box (center, size) of this node and all its children (tight fit to objects) - LLVector4a* mExtents; // extents (min, max) of this node and all its children + LLVector4a mBounds[2]; // bounding box (center, size) of this node and all its children (tight fit to objects) + LLVector4a mExtents[2]; // extents (min, max) of this node and all its children }; class LLOctreeTriangleRayIntersect : public LLOctreeTraveler<LLVolumeTriangle> |