diff options
author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-12-05 19:21:11 +0200 |
---|---|---|
committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-12-05 19:21:11 +0200 |
commit | 84c546182c67b2d9f6542f95d979ed33903cb95f (patch) | |
tree | d0a1e3c77c3e1aad83ae3b0a3a0c345450d31f07 /indra/newview/lltoolgrab.cpp | |
parent | 0eeb9c87e8aa1c682c1acb996fe3f2ca5b24eda4 (diff) |
Backed out changeset: ffffbe002ff2
Finally reverting the MAINT-4488 (see BUG-37693 for details)
Diffstat (limited to 'indra/newview/lltoolgrab.cpp')
-rw-r--r-- | indra/newview/lltoolgrab.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltoolgrab.cpp b/indra/newview/lltoolgrab.cpp index ed32e584a5..5623036b91 100644 --- a/indra/newview/lltoolgrab.cpp +++ b/indra/newview/lltoolgrab.cpp @@ -143,7 +143,7 @@ BOOL LLToolGrabBase::handleMouseDown(S32 x, S32 y, MASK mask) // call the base class to propogate info to sim LLTool::handleMouseDown(x, y, mask); - if (!gAgent.leftButtonBlocked()) + if (!gAgent.leftButtonGrabbed()) { // can grab transparent objects (how touch event propagates, scripters rely on this) gViewerWindow->pickAsync(x, y, mask, pickCallback, /*BOOL pick_transparent*/ TRUE); |