diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-06-19 12:24:44 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-06-19 12:24:44 -0700 |
| commit | b3c010ea7130331d454c480b82d1309bac712004 (patch) | |
| tree | 8f5e2ba709ebd52400f2831785e0c07c3396815f /indra/newview/llvograss.h | |
| parent | d65f09ebcafe6ca968236a9991961983d4cd7a47 (diff) | |
| parent | 2655c7a17ae38a073dcf8f05b0127b68edc34c95 (diff) | |
Pull merge lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llvograss.h')
| -rwxr-xr-x | indra/newview/llvograss.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llvograss.h b/indra/newview/llvograss.h index b9835b8802..122806766d 100755 --- a/indra/newview/llvograss.h +++ b/indra/newview/llvograss.h @@ -75,14 +75,14 @@ public: /*virtual*/ BOOL isActive() const; // Whether this object needs to do an idleUpdate. /*virtual*/ void idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time); - /*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 sMaxGrassSpecies; |