Vectorized octree and much of llspatialpartition and lldrawable.

Octree driven raycast.

1 files changed, 2 insertions, 14 deletions

diff --git a/indra/llmath/llvolume.h b/indra/llmath/llvolume.h
index 0ae8aa19ca..c49d1c650d 100644
--- a/indra/llmath/llvolume.h
+++ b/indra/llmath/llvolume.h
@@ -46,6 +46,7 @@ template <class T> class LLOctreeNode;
 class LLVector4a;
 class LLVolumeFace;
 class LLVolume;
+class LLVolumeTriangle;
 
 #include "lldarray.h"
 #include "lluuid.h"
@@ -918,20 +919,7 @@ public:
 	// mWeights.size() should be empty or match mVertices.size()  
 	LLVector4a* mWeights;
 
-	class Triangle : public LLRefCount
-	{
-	public:
-		const LLVector4a* mV[3];
-		U16 mIndex[3];
-
-		LLVector3d mPositionGroup;
-		F64 mRadius;
-
-		virtual const LLVector3d& getPositionGroup() const;
-		virtual const F64& getBinRadius() const;
-	};
-
-	LLOctreeNode<Triangle>* mOctree;
+	LLOctreeNode<LLVolumeTriangle>* mOctree;
 
 private:
 	BOOL createUnCutCubeCap(LLVolume* volume, BOOL partial_build = FALSE);