summaryrefslogtreecommitdiff
path: root/indra/llmath/llvolumeoctree.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llmath/llvolumeoctree.h')
-rw-r--r--indra/llmath/llvolumeoctree.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/llmath/llvolumeoctree.h b/indra/llmath/llvolumeoctree.h
index 1f5a78b137..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>
@@ -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;