diff options
| author | leyla_linden <none@none> | 2011-03-01 14:32:49 -0800 |
|---|---|---|
| committer | leyla_linden <none@none> | 2011-03-01 14:32:49 -0800 |
| commit | 0a76e7620f3c97571ccd85a0d31392c0235d87ec (patch) | |
| tree | 0f032cae5c3d6648e6241cd523811d51278f8f27 /indra/newview/llvovolume.cpp | |
| parent | f24a040beb878a5d24519e2a849379f8d7b473bb (diff) | |
| parent | fcb205131ccc02b2b50e79ad274ed4ef4fec0330 (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);
|