diff options
| author | Tofu Buzzard <no-email> | 2011-03-01 14:47:46 -0800 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-03-01 14:47:46 -0800 |
| commit | b3a0dd4e164a8ab119bd01c9b4e5d91b04dfb985 (patch) | |
| tree | debfe4c894273cae38ccab7e94c14abe66d8adbe /indra/newview/llvovolume.cpp | |
| parent | 6fa702719c27c15e34942f76896e45c85f377937 (diff) | |
| parent | e0099952942595f4ff90fd66cfeea570c17a81c5 (diff) | |
merge
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index e3cc2f2589..132e50904a 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -3365,8 +3365,15 @@ BOOL LLVOVolume::lineSegmentIntersect(const LLVector3& start, const LLVector3& e end_face = face+1;
}
+ bool special_cursor = specialHoverCursor();
for (S32 i = start_face; i < end_face; ++i)
{
+ if (!special_cursor && !pick_transparent && getTE(i)->getColor().mV[3] == 0.f)
+ { //don't attempt to pick completely transparent faces unless
+ //pick_transparent is true
+ continue;
+ }
+
face_hit = volume->lineSegmentIntersect(v_start, v_end, i,
&p, &tc, &n, &bn);
|