summaryrefslogtreecommitdiff
path: root/indra/llmath/llvolume.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llmath/llvolume.h')
-rw-r--r--indra/llmath/llvolume.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/llmath/llvolume.h b/indra/llmath/llvolume.h
index c0b224b1ff..da155c7b41 100644
--- a/indra/llmath/llvolume.h
+++ b/indra/llmath/llvolume.h
@@ -35,7 +35,8 @@ class LLVolumeParams;
class LLProfile;
class LLPath;
-template <class T> class LLOctreeNode;
+template<class T> class LLPointer;
+template <class T, typename T_PTR> class LLOctreeNode;
class LLVolumeFace;
class LLVolume;
@@ -974,7 +975,9 @@ public:
// vertices per joint.
LLJointRiggingInfoTab mJointRiggingInfoTab;
- LLOctreeNode<LLVolumeTriangle>* mOctree;
+ // 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;