diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-05-29 05:37:38 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-05-29 05:37:38 -0500 |
| commit | 0e7f4dc5cef8a97cb1dd08aa2f79538ced267888 (patch) | |
| tree | f8556aa8a56a876bb0e1105bd7424da0ea05d17f /indra/newview/llhudicon.cpp | |
| parent | 0a54fb6b24790263c45f096415fee0e2d03323e0 (diff) | |
Octree per LLVolumeFace WIP
Diffstat (limited to 'indra/newview/llhudicon.cpp')
| -rw-r--r-- | indra/newview/llhudicon.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llhudicon.cpp b/indra/newview/llhudicon.cpp index 3c5a4de7f8..63040904df 100644 --- a/indra/newview/llhudicon.cpp +++ b/indra/newview/llhudicon.cpp @@ -286,7 +286,6 @@ BOOL LLHUDIcon::lineSegmentIntersect(const LLVector3& start, const LLVector3& en LLVector4a upper_right; upper_right.setAdd(lower_right, y_scalea); - F32 t = 0.f; LLVector4a enda; enda.load3(end.mV); LLVector4a starta; @@ -294,8 +293,10 @@ BOOL LLHUDIcon::lineSegmentIntersect(const LLVector3& start, const LLVector3& en LLVector4a dir; dir.setSub(enda, starta); - if (LLTriangleRayIntersect(upper_right, upper_left, lower_right, starta, dir, NULL, NULL, &t, FALSE) || - LLTriangleRayIntersect(upper_left, lower_left, lower_right, starta, dir, NULL, NULL, &t, FALSE)) + F32 a,b,t; + + if (LLTriangleRayIntersect(upper_right, upper_left, lower_right, starta, dir, a,b,t) || + LLTriangleRayIntersect(upper_left, lower_left, lower_right, starta, dir, a,b,t)) { if (intersection) { |