diff options
author | Palmer <palmer@lindenlab.com> | 2009-11-17 13:40:11 -0800 |
---|---|---|
committer | Palmer <palmer@lindenlab.com> | 2009-11-17 13:40:11 -0800 |
commit | 53495d74ee380d492cfed0af91f7660f49619a9f (patch) | |
tree | 5992e4769c9acbecc900710048a8eeb4a7806ae4 /indra/newview/llspatialpartition.h | |
parent | 2365dbcd459b37942ddacbcb7010232113a126c1 (diff) | |
parent | c02702f3871979cb7745b49aa502ac3c71f77681 (diff) |
Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/newview/llspatialpartition.h')
-rw-r--r-- | indra/newview/llspatialpartition.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llspatialpartition.h b/indra/newview/llspatialpartition.h index 64c2a9acbc..1d9127639a 100644 --- a/indra/newview/llspatialpartition.h +++ b/indra/newview/llspatialpartition.h @@ -59,6 +59,7 @@ class LLTextureAtlasSlot; S32 AABBSphereIntersect(const LLVector3& min, const LLVector3& max, const LLVector3 &origin, const F32 &rad); S32 AABBSphereIntersectR2(const LLVector3& min, const LLVector3& max, const LLVector3 &origin, const F32 &radius_squared); +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 LLVector3& center); |