diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index bed53093ce66edf8788c88248a871715edb0aa3e..c144a07512b7190c140bccae895a162d4a3e4191 100755
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -6951,10 +6951,18 @@ LLViewerObject* LLPipeline::lineSegmentIntersectInWorld(const LLVector4a& start,
 		{
 			local_tangent = *tangent;
 		}
+		else
+		{
+			local_tangent.clear();
+		}
 		if (normal)
 		{
 			local_normal = *normal;
 		}
+		else
+		{
+			local_normal.clear();
+		}
 				
 		const F32 ATTACHMENT_OVERRIDE_DIST = 0.1f;