diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-11-06 13:09:48 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-06 13:09:48 -0800 |
| commit | 78db8dd83b76466df83abc32d56aa74ac7b180f3 (patch) | |
| tree | 369b4d8db3081fcf71a27572a00d310c7b9aaaf6 /indra/llmath | |
| parent | d4f790f72866b43956ce4216bf6471c85f4afc6c (diff) | |
| parent | 3f8172707833f30d3c39d165c975bd3d97511080 (diff) | |
merge from remote repo
Diffstat (limited to 'indra/llmath')
| -rw-r--r-- | indra/llmath/llvolume.cpp | 2 |
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 { |