diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-06-03 12:51:11 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-06-03 12:51:11 -0500 |
| commit | b19d8fad3c0e32987c19eecd5dac4a303555762f (patch) | |
| tree | b679ad680c4eb6ac7a9f7b08bf0947ef4843e144 /indra/newview/llspatialpartition.h | |
| parent | 92541ee0bb92dbea6312ee1c81c2b86fbadc19a0 (diff) | |
| parent | c3f14b915c38a4978745f12f1f816572cce4b5a0 (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
Diffstat (limited to 'indra/newview/llspatialpartition.h')
| -rwxr-xr-x | indra/newview/llspatialpartition.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llspatialpartition.h b/indra/newview/llspatialpartition.h index 8ccc3efd66..9732be90af 100755 --- a/indra/newview/llspatialpartition.h +++ b/indra/newview/llspatialpartition.h @@ -204,7 +204,7 @@ public: }; }; -LL_ALIGN_PREFIX(16) +LL_ALIGN_PREFIX(64) class LLSpatialGroup : public LLOctreeListener<LLDrawable> { friend class LLSpatialPartition; @@ -490,13 +490,13 @@ public: LLSpatialGroup *put(LLDrawable *drawablep, BOOL was_visible = FALSE); BOOL remove(LLDrawable *drawablep, LLSpatialGroup *curp); - LLDrawable* lineSegmentIntersect(const LLVector3& start, const LLVector3& end, + LLDrawable* lineSegmentIntersect(const LLVector4a& start, const LLVector4a& end, BOOL pick_transparent, S32* face_hit, // return the face hit - LLVector3* intersection = NULL, // return the intersection point + LLVector4a* intersection = NULL, // return the intersection point LLVector2* tex_coord = NULL, // return the texture coordinates of the intersection point - LLVector3* normal = NULL, // return the surface normal at the intersection point - LLVector3* bi_normal = NULL // return the surface bi-normal at the intersection point + LLVector4a* normal = NULL, // return the surface normal at the intersection point + LLVector4a* tangent = NULL // return the surface tangent at the intersection point ); |