diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-06-04 10:56:49 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-06-04 10:56:49 -0500 |
| commit | 3c2920297e261a4df429037c08eba3f10b16e8c7 (patch) | |
| tree | 6dfb7733594798188076b22b4bb2ae4ddac9f996 /indra/newview/llvotree.h | |
| parent | 7fa8c2313b47959ba8c0a40d92461f6892e0d0d3 (diff) | |
| parent | 82bd96a61cb82f75dbb35b1a5e1d9e12eeeffc68 (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
Diffstat (limited to 'indra/newview/llvotree.h')
| -rwxr-xr-x | indra/newview/llvotree.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llvotree.h b/indra/newview/llvotree.h index 2a7eb21238..2ecb0303a1 100755 --- a/indra/newview/llvotree.h +++ b/indra/newview/llvotree.h @@ -106,14 +106,14 @@ public: F32 branches, F32 alpha); - /*virtual*/ BOOL lineSegmentIntersect(const LLVector3& start, const LLVector3& end, + /*virtual*/ BOOL lineSegmentIntersect(const LLVector4a& start, const LLVector4a& end, S32 face = -1, // which face to check, -1 = ALL_SIDES BOOL pick_transparent = FALSE, S32* face_hit = NULL, // which face was 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 ); static S32 sMaxTreeSpecies; |