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

FIRE-20833: Disabling mouse wheel zoom also disables scaling HUDs in build mode

Ansariel 2017-02-04 01:10:02 +01:00
parent eda726815a
commit 4f2cd0da24
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
indra/newview/llagentcamera.cpp
View File

@ -2105,17 +2105,18 @@ LLVector3 LLAgentCamera::getCameraOffsetInitial()
//-----------------------------------------------------------------------------
void LLAgentCamera::handleScrollWheel(S32 clicks)
{
// <FS:PP> Option to disable mouse wheel for camera zooming in/out
static LLCachedControl<bool> FSDisableMouseWheelCameraZoom(gSavedSettings, "FSDisableMouseWheelCameraZoom");
if(FSDisableMouseWheelCameraZoom)
{
return;
}
// </FS:PP>
if (mCameraMode == CAMERA_MODE_FOLLOW && getFocusOnAvatar())
{
// <FS:Ansariel> Option to disable mouse wheel for camera zooming in/out
if (FSDisableMouseWheelCameraZoom)
{
return;
}
// </FS:Ansariel>
if (!mFollowCam.getPositionLocked()) // not if the followCam position is locked in place
{
mFollowCam.zoom(clicks);
@ -2141,6 +2142,12 @@ void LLAgentCamera::handleScrollWheel(S32 clicks)
F32 zoom_factor = (F32)pow(0.8, -clicks);
cameraZoomIn(zoom_factor);
}
// <FS:Ansariel> Option to disable mouse wheel for camera zooming in/out
else if (FSDisableMouseWheelCameraZoom)
{
return;
}
// </FS:Ansariel>
else if (mFocusOnAvatar && (mCameraMode == CAMERA_MODE_THIRD_PERSON))
{
// <FS:Zi> Camera focus and offset with CTRL/SHIFT + Scroll wheel