diff options
| author | pavelkproductengine <pavelkproductengine@lindenlab.com> | 2016-03-21 18:36:50 +0200 |
|---|---|---|
| committer | pavelkproductengine <pavelkproductengine@lindenlab.com> | 2016-03-21 18:36:50 +0200 |
| commit | 5bbf263c293286395730d969e0b9beec9d830f48 (patch) | |
| tree | 22b81dea68f728ec122de561cb8d77fe4fb14d94 /indra/newview/lltoolgrab.cpp | |
| parent | 824deea265614b649e074d4702e8f4bf071cef68 (diff) | |
| parent | 4aae7b51616c0963af4668442bdb5bfaba8c5044 (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); |