diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-06-03 12:53:11 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-06-03 12:53:11 -0500 |
| commit | 64d51dbc4482c12bc1ae56598b924cfe6f0ff0e9 (patch) | |
| tree | 482cc191426a9332d3b900b7f8136f6a340ddb64 /indra/newview/llhudtext.cpp | |
| parent | 8b16faec3096e32b76b227efcb67fd33e7254f40 (diff) | |
| parent | 26ba00b5554d20ee958693ced87b36fa7f6e3d99 (diff) | |
merge
Diffstat (limited to 'indra/newview/llhudtext.cpp')
| -rw-r--r-- | indra/newview/llhudtext.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llhudtext.cpp b/indra/newview/llhudtext.cpp index 9ed5d13831..7f9eddc837 100644 --- a/indra/newview/llhudtext.cpp +++ b/indra/newview/llhudtext.cpp @@ -207,10 +207,11 @@ BOOL LLHUDText::lineSegmentIntersect(const LLVector3& start, const LLVector3& en } LLVector3 dir = end-start; - F32 t = 0.f; + F32 a,b,t; - if (LLTriangleRayIntersect(v[0], v[1], v[2], start, dir, NULL, NULL, &t, FALSE) || - LLTriangleRayIntersect(v[2], v[3], v[0], start, dir, NULL, NULL, &t, FALSE) ) + + if (LLTriangleRayIntersect(v[0], v[1], v[2], start, dir, a, b, t, FALSE) || + LLTriangleRayIntersect(v[2], v[3], v[0], start, dir, a, b, t, FALSE) ) { if (t <= 1.f) { |