Second Life viewer sources 1.21.0-RC

1 files changed, 8 insertions, 1 deletions

diff --git a/linden/indra/newview/llspatialpartition.h b/linden/indra/newview/llspatialpartition.h
index b4b1101..bd09da2 100644
--- a/linden/indra/newview/llspatialpartition.h
+++ b/linden/indra/newview/llspatialpartition.h
@@ -300,7 +300,14 @@ public:
         LLSpatialGroup *put(LLDrawable *drawablep, BOOL was_visible = FALSE);
         BOOL remove(LLDrawable *drawablep, LLSpatialGroup *curp);
         
-        LLDrawable*     pickDrawable(const LLVector3& start, const LLVector3& end, LLVector3& collision);
+        LLDrawable* lineSegmentIntersect(const LLVector3& start, const LLVector3& end,
+                                                                         S32* face_hit,                          // return the face hit
+                                                                         LLVector3* 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
+                );
+        
         
         // If the drawable moves, move it here.
         virtual void move(LLDrawable *drawablep, LLSpatialGroup *curp, BOOL immediate = FALSE);