diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-05-21 10:17:34 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-05-21 10:17:34 -0700 |
| commit | 78e62fe0f16d95a2afb6c4205b121db189c297b9 (patch) | |
| tree | ec509ca6b2c721c65c6d81d978732267e2ce21c5 /indra/newview/lltoolpie.cpp | |
| parent | b07a8f7033dae6250e144aca4c274d935b648cf7 (diff) | |
| parent | 2672194b1d3eb03648861a29e57d81a38f527746 (diff) | |
Merge viewer-release 6.2.3
Diffstat (limited to 'indra/newview/lltoolpie.cpp')
| -rw-r--r-- | indra/newview/lltoolpie.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index 697db01d11..d5ffdef4c9 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -111,6 +111,8 @@ BOOL LLToolPie::handleMouseDown(S32 x, S32 y, MASK mask) mMouseOutsideSlop = FALSE; mMouseDownX = x; mMouseDownY = y; + +#if 0 LLTimer pick_timer; BOOL pick_rigged = false; //gSavedSettings.getBOOL("AnimatedObjectsAllowLeftClick"); mPick = gViewerWindow->pickImmediate(x, y, FALSE, pick_rigged); @@ -128,7 +130,10 @@ BOOL LLToolPie::handleMouseDown(S32 x, S32 y, MASK mask) mPick = gViewerWindow->pickImmediate(x, y, TRUE /*transparent*/, pick_rigged); } LL_INFOS() << "pick_rigged is " << (S32) pick_rigged << " pick time elapsed " << pick_timer.getElapsedTimeF32() << LL_ENDL; +#endif + //left mouse down always picks transparent (but see handleMouseUp) + mPick = gViewerWindow->pickImmediate(x, y, TRUE, FALSE); mPick.mKeyMask = mask; mMouseButtonDown = true; |