From 562b0ab82bf929ef338374f5b71ba5a3a3f5c267 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Thu, 14 Apr 2011 22:34:55 -0700
Subject: Applied lineSegmentIntersectFix from the Cool Viewer, backported from
 SG2

---
 linden/indra/llmath/llvolume.cpp    | 2 +-
 linden/indra/newview/llvovolume.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/linden/indra/llmath/llvolume.cpp b/linden/indra/llmath/llvolume.cpp
index c4c3f07..618048c 100644
--- a/linden/indra/llmath/llvolume.cpp
+++ b/linden/indra/llmath/llvolume.cpp
@@ -3583,7 +3583,7 @@ S32 LLVolume::lineSegmentIntersect(const LLVector3& start, const LLVector3& end,
 	if (face == -1) // ALL_SIDES
 	{
 		start_face = 0;
-		end_face = getNumFaces() - 1;
+		end_face = getNumVolumeFaces() - 1;
 	}
 	else
 	{
diff --git a/linden/indra/newview/llvovolume.cpp b/linden/indra/newview/llvovolume.cpp
index 8666e4a..4a53d4e 100644
--- a/linden/indra/newview/llvovolume.cpp
+++ b/linden/indra/newview/llvovolume.cpp
@@ -2010,7 +2010,7 @@ BOOL LLVOVolume::lineSegmentIntersect(const LLVector3& start, const LLVector3& e
 		if (face == -1)
 		{
 			start_face = 0;
-			end_face = volume->getNumFaces();
+			end_face = volume->getNumVolumeFaces();
 		}
 		else
 		{
-- 
cgit v1.1