livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backed out changeset: a1ba5b935f34

AndreyL ProductEngine 2019-05-11 01:40:28 +03:00
parent 34322f8f37
commit 83f4b8a775
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
indra/newview/lltoolpie.cpp
View File

@ -111,24 +111,9 @@ BOOL LLToolPie::handleMouseDown(S32 x, S32 y, MASK mask)
mMouseOutsideSlop = FALSE;
mMouseDownX = x;
mMouseDownY = y;
LLTimer pick_timer;
BOOL pick_rigged = false; //gSavedSettings.getBOOL("AnimatedObjectsAllowLeftClick");
mPick = gViewerWindow->pickImmediate(x, y, FALSE, pick_rigged);
LLViewerObject *object = mPick.getObject();
LLViewerObject *parent = object ? object->getRootEdit() : NULL;
if (!object
|| object->isAttachment()
|| object->getClickAction() == CLICK_ACTION_DISABLED
|| (!useClickAction(mask, object, parent) && !object->flagHandleTouch() && !(parent && parent->flagHandleTouch())))
{
// Unless we are hovering over actionable visible object
// left mouse down always picks transparent (but see handleMouseUp).
// Also see LLToolPie::handleHover() - priorities are a bit different there.
// Todo: we need a more consistent set of rules to work with
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;
//left mouse down always picks transparent (but see handleMouseUp)
mPick = gViewerWindow->pickImmediate(x, y, TRUE, FALSE);
mPick.mKeyMask = mask;
mMouseButtonDown = true;