summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerwindow.cpp
diff options
context:
space:
mode:
authorleyla_linden <none@none>2011-03-01 14:32:49 -0800
committerleyla_linden <none@none>2011-03-01 14:32:49 -0800
commit0a76e7620f3c97571ccd85a0d31392c0235d87ec (patch)
tree0f032cae5c3d6648e6241cd523811d51278f8f27 /indra/newview/llviewerwindow.cpp
parentf24a040beb878a5d24519e2a849379f8d7b473bb (diff)
parentfcb205131ccc02b2b50e79ad274ed4ef4fec0330 (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;
}