summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerwindow.cpp
diff options
context:
space:
mode:
authorTofu Buzzard <no-email>2011-03-01 14:47:39 -0800
committerTofu Buzzard <no-email>2011-03-01 14:47:39 -0800
commite0099952942595f4ff90fd66cfeea570c17a81c5 (patch)
tree8b401bdf5473a2a88c19ff54b186c105db578523 /indra/newview/llviewerwindow.cpp
parent858a544dc97b340f0cd2ad21c677f8683935c1fa (diff)
parent0a76e7620f3c97571ccd85a0d31392c0235d87ec (diff)
merge
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
-rw-r--r--indra/newview/llviewerwindow.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 94fb0b7d31..7aa90bd76d 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -3698,7 +3698,7 @@ LLViewerObject* LLViewerWindow::cursorIntersect(S32 mouse_x, S32 mouse_y, F32 de
{
found = gPipeline.lineSegmentIntersectInWorld(mouse_world_start, mouse_world_end, pick_transparent,
face_hit, intersection, uv, normal, binormal);
- if (found)
+ if (found && !pick_transparent)
{
gDebugRaycastIntersection = *intersection;
}