diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-08-28 23:57:41 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-08-28 23:57:41 +0000 |
| commit | 4a6bacea0f8dcff959028f285bc533852da608b5 (patch) | |
| tree | 7f49b429051e550f70917ccbcdd1c27bf86f5bdf /indra/llmath/llvolume.cpp | |
| parent | ac4766d4354ee1945f1569a94d755e3e7c0cd566 (diff) | |
merge viewer/viewer_1-21 94170-94770 -> release
merge viewer/viewer_1-21-0 94830-95157 -> release
Includes:
QAR-786 Sandbox buildme for viewer + server Release Notes on the wiki!
QAR-797 teleport failures (DEV-6198 / SVC-972) mergeme
Diffstat (limited to 'indra/llmath/llvolume.cpp')
| -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 1ea1fc519d..ba0cfa6ff5 100644 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -3533,7 +3533,7 @@ S32 LLVolume::lineSegmentIntersect(const LLVector3& start, const LLVector3& end, for (S32 i = start_face; i <= end_face; i++) { - LLVolumeFace face = getVolumeFace((U32)i); + const LLVolumeFace &face = getVolumeFace((U32)i); LLVector3 box_center = (face.mExtents[0] + face.mExtents[1]) / 2.f; LLVector3 box_size = face.mExtents[1] - face.mExtents[0]; |