diff options
| author | leyla_linden <none@none> | 2011-01-06 16:43:57 -0800 |
|---|---|---|
| committer | leyla_linden <none@none> | 2011-01-06 16:43:57 -0800 |
| commit | 523722652259d37841be2ad4ad283df4887ad372 (patch) | |
| tree | 3872f4235183254667bb0452ff5faf6554c7c69c /indra/newview/llspatialpartition.h | |
| parent | f243f7e550b9dadd26d119bfeb4b215aa809997c (diff) | |
| parent | d8cf705d0189ec34b1202ee50ea3e5991cf4c90f (diff) | |
Merge
Diffstat (limited to 'indra/newview/llspatialpartition.h')
| -rw-r--r-- | indra/newview/llspatialpartition.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llspatialpartition.h b/indra/newview/llspatialpartition.h index 16ec9f780b..85fd66b297 100644 --- a/indra/newview/llspatialpartition.h +++ b/indra/newview/llspatialpartition.h @@ -59,7 +59,8 @@ S32 AABBSphereIntersectR2(const LLVector3& min, const LLVector3& max, const LLVe void pushVerts(LLFace* face, U32 mask); // get index buffer for binary encoded axis vertex buffer given a box at center being viewed by given camera -U8* get_box_fan_indices(LLCamera* camera, const LLVector4a& center); +U32 get_box_fan_indices(LLCamera* camera, const LLVector4a& center); +U8* get_box_fan_indices_ptr(LLCamera* camera, const LLVector4a& center); class LLDrawInfo : public LLRefCount { @@ -393,7 +394,7 @@ public: LLSpatialPartition* mSpatialPartition; LLPointer<LLVertexBuffer> mVertexBuffer; - LLVector4a* mOcclusionVerts; + LLPointer<LLVertexBuffer> mOcclusionVerts; GLuint mOcclusionQuery[LLViewerCamera::NUM_CAMERAS]; U32 mBufferUsage; |