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

FIRE-19357: Hotfixing mouse capture in mouselook issue with minimal impact workaround for now

master
Ansariel 2016-06-17 12:31:10 +02:00
parent b522e72cb3
commit eac02648a0
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/lltoolgrab.cpp
View File

@ -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())
// <FS:Ansariel> 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()))
// </FS:Ansariel>
{
// can grab transparent objects (how touch event propagates, scripters rely on this)
gViewerWindow->pickAsync(x, y, mask, pickCallback, /*BOOL pick_transparent*/ TRUE);