From eac02648a08986d15c67c7a04a784c2004faecd9 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 17 Jun 2016 12:31:10 +0200 Subject: [PATCH] FIRE-19357: Hotfixing mouse capture in mouselook issue with minimal impact workaround for now --- indra/newview/lltoolgrab.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/indra/newview/lltoolgrab.cpp b/indra/newview/lltoolgrab.cpp index 0c3a537c41..ab46967160 100644 --- a/indra/newview/lltoolgrab.cpp +++ b/indra/newview/lltoolgrab.cpp @@ -146,7 +146,10 @@ 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.leftButtonBlocked()) + // FIRE-19357: Hotfixing mouse capture in mouselook issue with minimal impact workaround for now + //if (!gAgent.leftButtonBlocked()) + if ((gAgentCamera.cameraMouselook() && !gAgent.leftButtonGrabbed()) || (!gAgentCamera.cameraMouselook() && !gAgent.leftButtonBlocked())) + // { // can grab transparent objects (how touch event propagates, scripters rely on this) gViewerWindow->pickAsync(x, y, mask, pickCallback, /*BOOL pick_transparent*/ TRUE);