diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-03-22 16:19:10 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-03-22 16:19:10 -0400 |
| commit | 0879c48d832a69050e6fc6ac67b0d5f95b52e054 (patch) | |
| tree | c872ae80e13d12c3a282fd2af2c5005b0edb5e95 /indra/newview/lltoolgrab.cpp | |
| parent | cbbe82b8dc08260aa4102214a7c99aeab7915371 (diff) | |
| parent | 2afde26d93cc8773f5e84d187844f909347fc1bf (diff) | |
merge
Diffstat (limited to 'indra/newview/lltoolgrab.cpp')
| -rwxr-xr-x | 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 92e8af985b..c0ca4d7a9a 100755 --- a/indra/newview/lltoolgrab.cpp +++ b/indra/newview/lltoolgrab.cpp @@ -143,7 +143,7 @@ BOOL LLToolGrab::handleMouseDown(S32 x, S32 y, MASK mask) // call the base class to propogate info to sim LLTool::handleMouseDown(x, y, mask); - if (!gAgent.leftButtonGrabbed()) + if (!gAgent.leftButtonBlocked()) { // can grab transparent objects (how touch event propagates, scripters rely on this) gViewerWindow->pickAsync(x, y, mask, pickCallback, /*BOOL pick_transparent*/ TRUE); |