diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2015-12-04 16:09:15 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2015-12-04 16:09:15 -0500 |
| commit | d69a0e692e420e5b95e9bcb4ad1e7c5cfa283468 (patch) | |
| tree | dba5f50b894e52ad961f599702f3da801e3518b9 /indra/newview/lltoolfocus.cpp | |
| parent | c4de6b93d3c3f182fc7bf28e5c285e4d14da0764 (diff) | |
| parent | 6ed6158ac68076b6a6242a3a74a3394846227e04 (diff) | |
Automated merge with ssh://bitbucket.org/nat_linden/viewer-no-leap-test
Diffstat (limited to 'indra/newview/lltoolfocus.cpp')
| -rwxr-xr-x | indra/newview/lltoolfocus.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltoolfocus.cpp b/indra/newview/lltoolfocus.cpp index 15f3c36674..c4696c3a01 100755 --- a/indra/newview/lltoolfocus.cpp +++ b/indra/newview/lltoolfocus.cpp @@ -135,7 +135,7 @@ BOOL LLToolCamera::handleMouseDown(S32 x, S32 y, MASK mask) gViewerWindow->hideCursor(); - gViewerWindow->pickAsync(x, y, mask, pickCallback, FALSE, TRUE); + gViewerWindow->pickAsync(x, y, mask, pickCallback, /*BOOL pick_transparent*/ FALSE, /*BOOL pick_rigged*/ FALSE, /*BOOL pick_unselectable*/ TRUE); return TRUE; } |