diff options
| author | AndreyL ProductEngine <andreylproductengine@lindenlab.com> | 2015-07-23 23:59:05 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <andreylproductengine@lindenlab.com> | 2015-07-23 23:59:05 +0300 |
| commit | 57904b4def8c75a865ba503976de98d9ee4c0d94 (patch) | |
| tree | 923e35ad6197d9487f56f87dc6417c5972858bc5 /indra/newview/lltooldraganddrop.cpp | |
| parent | 269cc894a95904578fe34cd89c563dc650349df8 (diff) | |
MAINT-5416 Reverted changeset: 9bd24c17d908
Diffstat (limited to 'indra/newview/lltooldraganddrop.cpp')
| -rwxr-xr-x | indra/newview/lltooldraganddrop.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp index 2cc0cac1a8..b9177f2d12 100755 --- a/indra/newview/lltooldraganddrop.cpp +++ b/indra/newview/lltooldraganddrop.cpp @@ -846,12 +846,12 @@ void LLToolDragAndDrop::dragOrDrop3D( S32 x, S32 y, MASK mask, BOOL drop, EAccep if (mDrop) { // don't allow drag and drop onto transparent objects - pick(gViewerWindow->pickImmediate(x, y, FALSE, FALSE)); + pick(gViewerWindow->pickImmediate(x, y, FALSE)); } else { // don't allow drag and drop onto transparent objects - gViewerWindow->pickAsync(x, y, mask, pickCallback, FALSE, FALSE); + gViewerWindow->pickAsync(x, y, mask, pickCallback, FALSE); } *acceptance = mLastAccept; |