diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-06 12:15:41 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-06 12:15:41 -0800 |
| commit | afe6350160aa93323a6a5d8ef8c6206bffc337e0 (patch) | |
| tree | a26403aaf4ce4aa8098ca54a84a970b9056f05eb /indra/llmath | |
| parent | e654475529d924603a9b3bc8c4775c86d3cf7933 (diff) | |
| parent | 35e200881c38eb6c1bfd1f14ef440d4bc4da8c74 (diff) | |
merge from texture-pipeline
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 { |