summaryrefslogtreecommitdiff
path: root/indra/newview/lltoolgrab.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2016-01-15 17:01:16 -0500
committerOz Linden <oz@lindenlab.com>2016-01-15 17:01:16 -0500
commit9848fc42534e48d20cf6d6732aae1c8233580792 (patch)
treecdc30035e2b6ced3cf6d4f9df1844ea7dc4c2836 /indra/newview/lltoolgrab.cpp
parent4b7ff25eba4b285e267ec6f766221ffcde82a808 (diff)
parent5a5c023e291990a463b1a91846ce82c70da8daab (diff)
merge changes for 4.0.1-release
Diffstat (limited to 'indra/newview/lltoolgrab.cpp')
-rwxr-xr-xindra/newview/lltoolgrab.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltoolgrab.cpp b/indra/newview/lltoolgrab.cpp
index fa6694b93b..92e8af985b 100755
--- a/indra/newview/lltoolgrab.cpp
+++ b/indra/newview/lltoolgrab.cpp
@@ -146,7 +146,7 @@ BOOL LLToolGrab::handleMouseDown(S32 x, S32 y, MASK mask)
if (!gAgent.leftButtonGrabbed())
{
// can grab transparent objects (how touch event propagates, scripters rely on this)
- gViewerWindow->pickAsync(x, y, mask, pickCallback, TRUE);
+ gViewerWindow->pickAsync(x, y, mask, pickCallback, /*BOOL pick_transparent*/ TRUE);
}
mClickedInMouselook = gAgentCamera.cameraMouselook();
return TRUE;