summaryrefslogtreecommitdiff
path: root/indra/llmath
diff options
context:
space:
mode:
authorSteve Bennetts <steve@lindenlab.com>2009-11-06 12:20:52 -0800
committerSteve Bennetts <steve@lindenlab.com>2009-11-06 12:20:52 -0800
commit0db73b1ac58650bf681803c93767c64c3d908e15 (patch)
treecba28950adfcf3b8040f1bc7cf449ddab6379b85 /indra/llmath
parent5b5df4769773025978409590e14a807ea2790c84 (diff)
parentafe6350160aa93323a6a5d8ef8c6206bffc337e0 (diff)
merge
Diffstat (limited to 'indra/llmath')
-rw-r--r--indra/llmath/llvolume.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp
index b8ef92f9a9..df4c618ac1 100644
--- a/indra/llmath/llvolume.cpp
+++ b/indra/llmath/llvolume.cpp
@@ -3582,7 +3582,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
{