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

FIRE-15578: After exiting mouselook, left clicking on a touchable object opens build floater

Ansariel 2015-02-18 10:29:53 +01:00
parent 3a49a2774c
commit 4075434775
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/lltoolgrab.cpp
View File

@ -970,11 +970,15 @@ BOOL LLToolGrab::handleMouseUp(S32 x, S32 y, MASK mask)
mMode = GRAB_INACTIVE;
if(mClickedInMouselook && !gAgentCamera.cameraMouselook())
{
mClickedInMouselook = FALSE;
}
else
// <FS:Ansariel> FIRE-15578: After exiting mouselook, left clicking on a touchable object opens build floater
//if(mClickedInMouselook && !gAgentCamera.cameraMouselook())
//{
// mClickedInMouselook = FALSE;
//}
//else
// </FS:Ansariel>
if ((mClickedInMouselook && gAgentCamera.cameraMouselook()) ||
(!mClickedInMouselook && !gAgentCamera.cameraMouselook()))
{
// HACK: Make some grabs temporary
if (gGrabTransientTool)
@ -983,6 +987,8 @@ BOOL LLToolGrab::handleMouseUp(S32 x, S32 y, MASK mask)
gGrabTransientTool = NULL;
}
}
// <FS:Ansariel> FIRE-15578: After exiting mouselook, left clicking on a touchable object opens build floater
mClickedInMouselook = FALSE;
//gAgent.setObjectTracking(gSavedSettings.getBOOL("TrackFocusObject"));