Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A

# Conflicts:
#	autobuild.xml
#	indra/cmake/CMakeLists.txt
#	indra/cmake/GoogleMock.cmake
#	indra/llaudio/llaudioengine_fmodstudio.cpp
#	indra/llaudio/llaudioengine_fmodstudio.h
#	indra/llaudio/lllistener_fmodstudio.cpp
#	indra/llaudio/lllistener_fmodstudio.h
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/llaudio/llstreamingaudio_fmodstudio.h
#	indra/llcharacter/llmultigesture.cpp
#	indra/llcharacter/llmultigesture.h
#	indra/llimage/llimage.cpp
#	indra/llimage/llimagepng.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llimage/tests/llimageworker_test.cpp
#	indra/llmessage/tests/llmockhttpclient.h
#	indra/llprimitive/llgltfmaterial.h
#	indra/llrender/llfontfreetype.cpp
#	indra/llui/llcombobox.cpp
#	indra/llui/llfolderview.cpp
#	indra/llui/llfolderviewmodel.h
#	indra/llui/lllineeditor.cpp
#	indra/llui/lllineeditor.h
#	indra/llui/lltextbase.cpp
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltextvalidate.cpp
#	indra/llui/lltextvalidate.h
#	indra/llui/lluictrl.h
#	indra/llui/llview.cpp
#	indra/llwindow/llwindowmacosx.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappearancemgr.cpp
#	indra/newview/llappearancemgr.h
#	indra/newview/llavatarpropertiesprocessor.cpp
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llbreadcrumbview.cpp
#	indra/newview/llbreadcrumbview.h
#	indra/newview/llbreastmotion.cpp
#	indra/newview/llbreastmotion.h
#	indra/newview/llconversationmodel.h
#	indra/newview/lldensityctrl.cpp
#	indra/newview/lldensityctrl.h
#	indra/newview/llface.inl
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
#	indra/newview/llfloateremojipicker.h
#	indra/newview/llfloaterimsessiontab.cpp
#	indra/newview/llfloaterprofiletexture.cpp
#	indra/newview/llfloaterprofiletexture.h
#	indra/newview/llgesturemgr.cpp
#	indra/newview/llgesturemgr.h
#	indra/newview/llimpanel.cpp
#	indra/newview/llimpanel.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryclipboard.cpp
#	indra/newview/llinventoryclipboard.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorygallery.cpp
#	indra/newview/lllistbrowser.cpp
#	indra/newview/lllistbrowser.h
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofile.h
#	indra/newview/llpreviewgesture.cpp
#	indra/newview/llsavedsettingsglue.cpp
#	indra/newview/llsavedsettingsglue.h
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/llurllineeditorctrl.cpp
#	indra/newview/llvectorperfoptions.cpp
#	indra/newview/llvectorperfoptions.h
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llviewertexlayer.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/macmain.h
#	indra/test/test.cpp

1 files changed, 229 insertions, 229 deletions

diff --git a/indra/llmath/raytrace.h b/indra/llmath/raytrace.h
index 2352790b1f..8892347f9b 100644
--- a/indra/llmath/raytrace.h
+++ b/indra/llmath/raytrace.h
@@ -1,229 +1,229 @@
-/** 
- * @file raytrace.h
- * @brief Ray intersection tests for primitives.
- *
- * $LicenseInfo:firstyear=2001&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#ifndef LL_RAYTRACE_H
-#define LL_RAYTRACE_H
-
-class LLVector3;
-class LLQuaternion;
-
-// All functions produce results in the same reference frame as the arguments.
-//
-// Any arguments of the form "foo_direction" or "foo_normal" are assumed to
-// be normalized, or normalized vectors are stored in them.
-//
-// Vector arguments of the form "shape_scale" represent the scale of the
-// object along the three axes.
-//
-// All functions return the expected true or false, unless otherwise noted.
-// When false is returned, any resulting values that might have been stored 
-// are undefined.
-//
-// Rays are defined by a "ray_point" and a "ray_direction" (unit).
-//
-// Lines are defined by a "line_point" and a "line_direction" (unit).
-//
-// Line segements are defined by "point_a" and "point_b", and for intersection
-// purposes are assumed to point from "point_a" to "point_b".
-//
-// A ray is different from a line in that it starts at a point and extends
-// in only one direction.
-//
-// Intersection normals always point outside the object, normal to the object's
-// surface at the point of intersection.
-//
-// Object rotations passed as quaternions are expected to rotate from the 
-// object's local frame to the absolute frame.  So, if "foo" is a vector in
-// the object's local frame, then "foo * object_rotation" is in the absolute
-// frame.
-
-
-// returns true if line is not parallel to plane.
-bool line_plane(const LLVector3 &line_point, const LLVector3 &line_direction,
-				const LLVector3 &plane_point, const LLVector3 plane_normal,
-				LLVector3 &intersection);
-
-
-// returns true if line is not parallel to plane.
-bool ray_plane(const LLVector3 &ray_point, const LLVector3 &ray_direction,
-			   const LLVector3 &plane_point, const LLVector3 plane_normal,
-			   LLVector3 &intersection);
-
-
-bool ray_circle(const LLVector3 &ray_point, const LLVector3 &ray_direction,
-				const LLVector3 &circle_center, const LLVector3 plane_normal, F32 circle_radius,
-				LLVector3 &intersection);
-
-// point_0 through point_2 define the plane_normal via the right-hand rule:
-// circle from point_0 to point_2 with fingers ==> thumb points in direction of normal
-bool ray_triangle(const LLVector3 &ray_point, const LLVector3 &ray_direction,
-				  const LLVector3 &point_0, const LLVector3 &point_1, const LLVector3 &point_2,
-				  LLVector3 &intersection, LLVector3 &intersection_normal);
-
-
-// point_0 is the lower-left corner, point_1 is the lower-right, point_2 is the upper-right
-// right-hand-rule... curl fingers from lower-left toward lower-right then toward upper-right
-// ==> thumb points in direction of normal
-// assumes a parallelogram, so point_3 is determined by the other points
-bool ray_quadrangle(const LLVector3 &ray_point, const LLVector3 &ray_direction,
-					const LLVector3 &point_0, const LLVector3 &point_1, const LLVector3 &point_2,
-					LLVector3 &intersection, LLVector3 &intersection_normal);
-
-
-bool ray_sphere(const LLVector3 &ray_point, const LLVector3 &ray_direction,
-				const LLVector3 &sphere_center, F32 sphere_radius,
-				LLVector3 &intersection, LLVector3 &intersection_normal);
-
-
-// finite right cylinder is defined by end centers: "cyl_top", "cyl_bottom", 
-// and by the cylinder radius "cyl_radius"
-bool ray_cylinder(const LLVector3 &ray_point, const LLVector3 &ray_direction,
-		          const LLVector3 &cyl_center, const LLVector3 &cyl_scale, const LLQuaternion &cyl_rotation,
-				  LLVector3 &intersection, LLVector3 &intersection_normal);
-
-
-// this function doesn't just return a bool because the return is currently
-// used to decide how to break up boxes that have been hit by shots... 
-// a hack that will probably be changed later
-//
-// returns a number representing the side of the box that was hit by the ray,
-// or NO_SIDE if intersection test failed.
-U32 ray_box(const LLVector3 &ray_point, const LLVector3 &ray_direction,
-		    const LLVector3 &box_center, const LLVector3 &box_scale, const LLQuaternion &box_rotation,
-			LLVector3 &intersection, LLVector3 &intersection_normal);
-
-
-/* TODO
-bool ray_ellipsoid(const LLVector3 &ray_point, const LLVector3 &ray_direction,
-				   const LLVector3 &e_center, const LLVector3 &e_scale, const LLQuaternion &e_rotation,
-				   LLVector3 &intersection, LLVector3 &intersection_normal);
-
-
-bool ray_cone(const LLVector3 &ray_point, const LLVector3 &ray_direction,
-			  const LLVector3 &cone_tip, const LLVector3 &cone_bottom, 
-			  const LLVector3 &cone_scale, const LLQuaternion &cone_rotation,
-			  LLVector3 &intersection, LLVector3 &intersection_normal);
-*/
-
-
-bool ray_prism(const LLVector3 &ray_point, const LLVector3 &ray_direction,
-			   const LLVector3 &prism_center, const LLVector3 &prism_scale, const LLQuaternion &prism_rotation,
-			   LLVector3 &intersection, LLVector3 &intersection_normal);
-
-
-bool ray_tetrahedron(const LLVector3 &ray_point, const LLVector3 &ray_direction,
-					 const LLVector3 &t_center, const LLVector3 &t_scale, const LLQuaternion &t_rotation,
-					 LLVector3 &intersection, LLVector3 &intersection_normal);
-
-
-bool ray_pyramid(const LLVector3 &ray_point, const LLVector3 &ray_direction,
-				 const LLVector3 &p_center, const LLVector3 &p_scale, const LLQuaternion &p_rotation,
-				 LLVector3 &intersection, LLVector3 &intersection_normal);
-
-
-
-/* TODO
-bool ray_hemiellipsoid(const LLVector3 &ray_point, const LLVector3 &ray_direction,
-					   const LLVector3 &e_center, const LLVector3 &e_scale, const LLQuaternion &e_rotation,
-					   const LLVector3 &e_cut_normal,
-					   LLVector3 &intersection, LLVector3 &intersection_normal);
-
-
-bool ray_hemisphere(const LLVector3 &ray_point, const LLVector3 &ray_direction,
-					const LLVector3 &sphere_center, F32 sphere_radius, const LLVector3 &sphere_cut_normal, 
-					LLVector3 &intersection, LLVector3 &intersection_normal);
-
-
-bool ray_hemicylinder(const LLVector3 &ray_point, const LLVector3 &ray_direction,
-					  const LLVector3 &cyl_top, const LLVector3 &cyl_bottom, F32 cyl_radius, 
-					  const LLVector3 &cyl_cut_normal,
-					  LLVector3 &intersection, LLVector3 &intersection_normal);
-
-
-bool ray_hemicone(const LLVector3 &ray_point, const LLVector3 &ray_direction,
-				  const LLVector3 &cone_tip, const LLVector3 &cone_bottom, 
-				  const LLVector3 &cone_scale, const LLVector3 &cyl_cut_normal,
-				  LLVector3 &intersection, LLVector3 &intersection_normal);
-*/
-
-
-bool linesegment_circle(const LLVector3 &point_a, const LLVector3 &point_b,
-						const LLVector3 &circle_center, const LLVector3 plane_normal, F32 circle_radius,
-						LLVector3 &intersection);
-
-// point_0 through point_2 define the plane_normal via the right-hand rule:
-// circle from point_0 to point_2 with fingers ==> thumb points in direction of normal
-bool linesegment_triangle(const LLVector3 &point_a, const LLVector3 &point_b,
-						  const LLVector3 &point_0, const LLVector3 &point_1, const LLVector3 &point_2, 
-						  LLVector3 &intersection, LLVector3 &intersection_normal);
-
-
-// point_0 is the lower-left corner, point_1 is the lower-right, point_2 is the upper-right
-// right-hand-rule... curl fingers from lower-left toward lower-right then toward upper-right
-// ==> thumb points in direction of normal
-// assumes a parallelogram, so point_3 is determined by the other points
-bool linesegment_quadrangle(const LLVector3 &point_a, const LLVector3 &point_b,
-							const LLVector3 &point_0, const LLVector3 &point_1, const LLVector3 &point_2, 
-							LLVector3 &intersection, LLVector3 &intersection_normal);
-
-
-bool linesegment_sphere(const LLVector3 &point_a, const LLVector3 &point_b,
-				const LLVector3 &sphere_center, F32 sphere_radius,
-				LLVector3 &intersection, LLVector3 &intersection_normal);
-
-
-// finite right cylinder is defined by end centers: "cyl_top", "cyl_bottom", 
-// and by the cylinder radius "cyl_radius"
-bool linesegment_cylinder(const LLVector3 &point_a, const LLVector3 &point_b,
-						  const LLVector3 &cyl_center, const LLVector3 &cyl_scale, const LLQuaternion &cyl_rotation,
-						  LLVector3 &intersection, LLVector3 &intersection_normal);
-
-
-// this function doesn't just return a bool because the return is currently
-// used to decide how to break up boxes that have been hit by shots... 
-// a hack that will probably be changed later
-//
-// returns a number representing the side of the box that was hit by the ray,
-// or NO_SIDE if intersection test failed.
-U32 linesegment_box(const LLVector3 &point_a, const LLVector3 &point_b, 
-					const LLVector3 &box_center, const LLVector3 &box_scale, const LLQuaternion &box_rotation,
-					LLVector3 &intersection, LLVector3 &intersection_normal);
-
-
-bool linesegment_prism(const LLVector3 &point_a, const LLVector3 &point_b,
-					   const LLVector3 &prism_center, const LLVector3 &prism_scale, const LLQuaternion &prism_rotation,
-					   LLVector3 &intersection, LLVector3 &intersection_normal);
-
-
-bool linesegment_tetrahedron(const LLVector3 &point_a, const LLVector3 &point_b,
-							 const LLVector3 &t_center, const LLVector3 &t_scale, const LLQuaternion &t_rotation,
-							 LLVector3 &intersection, LLVector3 &intersection_normal);
-
-
-bool linesegment_pyramid(const LLVector3 &point_a, const LLVector3 &point_b,
-						 const LLVector3 &p_center, const LLVector3 &p_scale, const LLQuaternion &p_rotation,
-						 LLVector3 &intersection, LLVector3 &intersection_normal);
-#endif
+/**

+ * @file raytrace.h

+ * @brief Ray intersection tests for primitives.

+ *

+ * $LicenseInfo:firstyear=2001&license=viewerlgpl$

+ * Second Life Viewer Source Code

+ * Copyright (C) 2010, Linden Research, Inc.

+ *

+ * This library is free software; you can redistribute it and/or

+ * modify it under the terms of the GNU Lesser General Public

+ * License as published by the Free Software Foundation;

+ * version 2.1 of the License only.

+ *

+ * This library is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+ * Lesser General Public License for more details.

+ *

+ * You should have received a copy of the GNU Lesser General Public

+ * License along with this library; if not, write to the Free Software

+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

+ *

+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA

+ * $/LicenseInfo$

+ */

+

+#ifndef LL_RAYTRACE_H

+#define LL_RAYTRACE_H

+

+class LLVector3;

+class LLQuaternion;

+

+// All functions produce results in the same reference frame as the arguments.

+//

+// Any arguments of the form "foo_direction" or "foo_normal" are assumed to

+// be normalized, or normalized vectors are stored in them.

+//

+// Vector arguments of the form "shape_scale" represent the scale of the

+// object along the three axes.

+//

+// All functions return the expected true or false, unless otherwise noted.

+// When false is returned, any resulting values that might have been stored

+// are undefined.

+//

+// Rays are defined by a "ray_point" and a "ray_direction" (unit).

+//

+// Lines are defined by a "line_point" and a "line_direction" (unit).

+//

+// Line segements are defined by "point_a" and "point_b", and for intersection

+// purposes are assumed to point from "point_a" to "point_b".

+//

+// A ray is different from a line in that it starts at a point and extends

+// in only one direction.

+//

+// Intersection normals always point outside the object, normal to the object's

+// surface at the point of intersection.

+//

+// Object rotations passed as quaternions are expected to rotate from the

+// object's local frame to the absolute frame.  So, if "foo" is a vector in

+// the object's local frame, then "foo * object_rotation" is in the absolute

+// frame.

+

+

+// returns true if line is not parallel to plane.

+bool line_plane(const LLVector3 &line_point, const LLVector3 &line_direction,

+                const LLVector3 &plane_point, const LLVector3 plane_normal,

+                LLVector3 &intersection);

+

+

+// returns true if line is not parallel to plane.

+bool ray_plane(const LLVector3 &ray_point, const LLVector3 &ray_direction,

+               const LLVector3 &plane_point, const LLVector3 plane_normal,

+               LLVector3 &intersection);

+

+

+bool ray_circle(const LLVector3 &ray_point, const LLVector3 &ray_direction,

+                const LLVector3 &circle_center, const LLVector3 plane_normal, F32 circle_radius,

+                LLVector3 &intersection);

+

+// point_0 through point_2 define the plane_normal via the right-hand rule:

+// circle from point_0 to point_2 with fingers ==> thumb points in direction of normal

+bool ray_triangle(const LLVector3 &ray_point, const LLVector3 &ray_direction,

+                  const LLVector3 &point_0, const LLVector3 &point_1, const LLVector3 &point_2,

+                  LLVector3 &intersection, LLVector3 &intersection_normal);

+

+

+// point_0 is the lower-left corner, point_1 is the lower-right, point_2 is the upper-right

+// right-hand-rule... curl fingers from lower-left toward lower-right then toward upper-right

+// ==> thumb points in direction of normal

+// assumes a parallelogram, so point_3 is determined by the other points

+bool ray_quadrangle(const LLVector3 &ray_point, const LLVector3 &ray_direction,

+                    const LLVector3 &point_0, const LLVector3 &point_1, const LLVector3 &point_2,

+                    LLVector3 &intersection, LLVector3 &intersection_normal);

+

+

+bool ray_sphere(const LLVector3 &ray_point, const LLVector3 &ray_direction,

+                const LLVector3 &sphere_center, F32 sphere_radius,

+                LLVector3 &intersection, LLVector3 &intersection_normal);

+

+

+// finite right cylinder is defined by end centers: "cyl_top", "cyl_bottom",

+// and by the cylinder radius "cyl_radius"

+bool ray_cylinder(const LLVector3 &ray_point, const LLVector3 &ray_direction,

+                  const LLVector3 &cyl_center, const LLVector3 &cyl_scale, const LLQuaternion &cyl_rotation,

+                  LLVector3 &intersection, LLVector3 &intersection_normal);

+

+

+// this function doesn't just return a bool because the return is currently

+// used to decide how to break up boxes that have been hit by shots...

+// a hack that will probably be changed later

+//

+// returns a number representing the side of the box that was hit by the ray,

+// or NO_SIDE if intersection test failed.

+U32 ray_box(const LLVector3 &ray_point, const LLVector3 &ray_direction,

+            const LLVector3 &box_center, const LLVector3 &box_scale, const LLQuaternion &box_rotation,

+            LLVector3 &intersection, LLVector3 &intersection_normal);

+

+

+/* TODO

+bool ray_ellipsoid(const LLVector3 &ray_point, const LLVector3 &ray_direction,

+                   const LLVector3 &e_center, const LLVector3 &e_scale, const LLQuaternion &e_rotation,

+                   LLVector3 &intersection, LLVector3 &intersection_normal);

+

+

+bool ray_cone(const LLVector3 &ray_point, const LLVector3 &ray_direction,

+              const LLVector3 &cone_tip, const LLVector3 &cone_bottom,

+              const LLVector3 &cone_scale, const LLQuaternion &cone_rotation,

+              LLVector3 &intersection, LLVector3 &intersection_normal);

+*/

+

+

+bool ray_prism(const LLVector3 &ray_point, const LLVector3 &ray_direction,

+               const LLVector3 &prism_center, const LLVector3 &prism_scale, const LLQuaternion &prism_rotation,

+               LLVector3 &intersection, LLVector3 &intersection_normal);

+

+

+bool ray_tetrahedron(const LLVector3 &ray_point, const LLVector3 &ray_direction,

+                     const LLVector3 &t_center, const LLVector3 &t_scale, const LLQuaternion &t_rotation,

+                     LLVector3 &intersection, LLVector3 &intersection_normal);

+

+

+bool ray_pyramid(const LLVector3 &ray_point, const LLVector3 &ray_direction,

+                 const LLVector3 &p_center, const LLVector3 &p_scale, const LLQuaternion &p_rotation,

+                 LLVector3 &intersection, LLVector3 &intersection_normal);

+

+

+

+/* TODO

+bool ray_hemiellipsoid(const LLVector3 &ray_point, const LLVector3 &ray_direction,

+                       const LLVector3 &e_center, const LLVector3 &e_scale, const LLQuaternion &e_rotation,

+                       const LLVector3 &e_cut_normal,

+                       LLVector3 &intersection, LLVector3 &intersection_normal);

+

+

+bool ray_hemisphere(const LLVector3 &ray_point, const LLVector3 &ray_direction,

+                    const LLVector3 &sphere_center, F32 sphere_radius, const LLVector3 &sphere_cut_normal,

+                    LLVector3 &intersection, LLVector3 &intersection_normal);

+

+

+bool ray_hemicylinder(const LLVector3 &ray_point, const LLVector3 &ray_direction,

+                      const LLVector3 &cyl_top, const LLVector3 &cyl_bottom, F32 cyl_radius,

+                      const LLVector3 &cyl_cut_normal,

+                      LLVector3 &intersection, LLVector3 &intersection_normal);

+

+

+bool ray_hemicone(const LLVector3 &ray_point, const LLVector3 &ray_direction,

+                  const LLVector3 &cone_tip, const LLVector3 &cone_bottom,

+                  const LLVector3 &cone_scale, const LLVector3 &cyl_cut_normal,

+                  LLVector3 &intersection, LLVector3 &intersection_normal);

+*/

+

+

+bool linesegment_circle(const LLVector3 &point_a, const LLVector3 &point_b,

+                        const LLVector3 &circle_center, const LLVector3 plane_normal, F32 circle_radius,

+                        LLVector3 &intersection);

+

+// point_0 through point_2 define the plane_normal via the right-hand rule:

+// circle from point_0 to point_2 with fingers ==> thumb points in direction of normal

+bool linesegment_triangle(const LLVector3 &point_a, const LLVector3 &point_b,

+                          const LLVector3 &point_0, const LLVector3 &point_1, const LLVector3 &point_2,

+                          LLVector3 &intersection, LLVector3 &intersection_normal);

+

+

+// point_0 is the lower-left corner, point_1 is the lower-right, point_2 is the upper-right

+// right-hand-rule... curl fingers from lower-left toward lower-right then toward upper-right

+// ==> thumb points in direction of normal

+// assumes a parallelogram, so point_3 is determined by the other points

+bool linesegment_quadrangle(const LLVector3 &point_a, const LLVector3 &point_b,

+                            const LLVector3 &point_0, const LLVector3 &point_1, const LLVector3 &point_2,

+                            LLVector3 &intersection, LLVector3 &intersection_normal);

+

+

+bool linesegment_sphere(const LLVector3 &point_a, const LLVector3 &point_b,

+                const LLVector3 &sphere_center, F32 sphere_radius,

+                LLVector3 &intersection, LLVector3 &intersection_normal);

+

+

+// finite right cylinder is defined by end centers: "cyl_top", "cyl_bottom",

+// and by the cylinder radius "cyl_radius"

+bool linesegment_cylinder(const LLVector3 &point_a, const LLVector3 &point_b,

+                          const LLVector3 &cyl_center, const LLVector3 &cyl_scale, const LLQuaternion &cyl_rotation,

+                          LLVector3 &intersection, LLVector3 &intersection_normal);

+

+

+// this function doesn't just return a bool because the return is currently

+// used to decide how to break up boxes that have been hit by shots...

+// a hack that will probably be changed later

+//

+// returns a number representing the side of the box that was hit by the ray,

+// or NO_SIDE if intersection test failed.

+U32 linesegment_box(const LLVector3 &point_a, const LLVector3 &point_b,

+                    const LLVector3 &box_center, const LLVector3 &box_scale, const LLQuaternion &box_rotation,

+                    LLVector3 &intersection, LLVector3 &intersection_normal);

+

+

+bool linesegment_prism(const LLVector3 &point_a, const LLVector3 &point_b,

+                       const LLVector3 &prism_center, const LLVector3 &prism_scale, const LLQuaternion &prism_rotation,

+                       LLVector3 &intersection, LLVector3 &intersection_normal);

+

+

+bool linesegment_tetrahedron(const LLVector3 &point_a, const LLVector3 &point_b,

+                             const LLVector3 &t_center, const LLVector3 &t_scale, const LLQuaternion &t_rotation,

+                             LLVector3 &intersection, LLVector3 &intersection_normal);

+

+

+bool linesegment_pyramid(const LLVector3 &point_a, const LLVector3 &point_b,

+                         const LLVector3 &p_center, const LLVector3 &p_scale, const LLQuaternion &p_rotation,

+                         LLVector3 &intersection, LLVector3 &intersection_normal);

+#endif