Changes to protect against use of normalize3fast on degenerate vectors

1 files changed, 4 insertions, 1 deletions

diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 0aa56fcc0f..8962d7cadf 100755
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -3751,7 +3751,8 @@ BOOL LLVOVolume::lineSegmentIntersect(const LLVector4a& start, const LLVector4a&
 						{
 							*normal = n;
 						}
-
+						// guard against NaNs in normalize below
+						llassert(normal->dot3(*normal).getF32() > F_APPROXIMATELY_ZERO);
 						(*normal).normalize3fast();
 					}
 
@@ -3774,6 +3775,8 @@ BOOL LLVOVolume::lineSegmentIntersect(const LLVector4a& start, const LLVector4a&
 						{
 							*tangent = tn;
 						}
+						// guard against NaNs in normalize below
+						llassert(tangent->dot3(*tangent).getF32() > F_APPROXIMATELY_ZERO);
 						(*tangent).normalize3fast();
 					}