diff options
| -rw-r--r-- | indra/llmath/llvolume.cpp | 2 | ||||
| -rw-r--r-- | indra/llmath/llvolumeoctree.cpp | 2 | ||||
| -rw-r--r-- | indra/llmath/llvolumeoctree.h | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp index 9fe4c622d7..c20124076b 100644 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -5522,7 +5522,7 @@ void LLVolumeFace::createOctree(F32 scaler, const LLVector4a& center, const LLVe center.setAdd(min, max); center.mul(0.5f); - *tri->mPositionGroup = center; + tri->mPositionGroup = center; //compute "radius" LLVector4a size; diff --git a/indra/llmath/llvolumeoctree.cpp b/indra/llmath/llvolumeoctree.cpp index 3a7cb4940a..cc97026ad4 100644 --- a/indra/llmath/llvolumeoctree.cpp +++ b/indra/llmath/llvolumeoctree.cpp @@ -191,7 +191,7 @@ void LLOctreeTriangleRayIntersect::visit(const LLOctreeNode<LLVolumeTriangle>* n const LLVector4a& LLVolumeTriangle::getPositionGroup() const { - return *mPositionGroup; + return mPositionGroup; } const F32& LLVolumeTriangle::getBinRadius() const diff --git a/indra/llmath/llvolumeoctree.h b/indra/llmath/llvolumeoctree.h index 1f5a78b137..63240ba022 100644 --- a/indra/llmath/llvolumeoctree.h +++ b/indra/llmath/llvolumeoctree.h @@ -96,7 +96,7 @@ class LLVolumeTriangle : public LLRefCount public: LLVolumeTriangle() { - mPositionGroup = (LLVector4a*) ll_aligned_malloc_16(16); + } LLVolumeTriangle(const LLVolumeTriangle& rhs) @@ -112,14 +112,14 @@ public: ~LLVolumeTriangle() { - ll_aligned_free_16(mPositionGroup); + } + LLVector4a mPositionGroup; + const LLVector4a* mV[3]; U16 mIndex[3]; - LLVector4a* mPositionGroup; - F32 mRadius; virtual const LLVector4a& getPositionGroup() const; |