Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup and revision to solve Issue 1548: Right click zoom in mouselook resets on left click.

Browse Source 
Removes variables tracking right mouse down from lltoolfocus and lltoolcompgun in favor of using the already existing LLViewerWindow::getRightMouseDown()
This commit is contained in:
Lirusaito
2014-10-30 11:15:36 -04:00
parent d34c5034c3
commit 637b70a723
5 changed files with 30 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llagentcamera.cpp
View File

@@ -2272,6 +2272,7 @@ void LLAgentCamera::changeCameraToFollow(BOOL animate)
if (mCameraMode == CAMERA_MODE_MOUSELOOK)
{
animate = FALSE;
if (gViewerWindow->getRightMouseDown()) LLViewerCamera::instance().loadDefaultFOV(); // <singu/> We could be zoomed in
}
startCameraAnimation();
@@ -2361,6 +2362,7 @@ void LLAgentCamera::changeCameraToThirdPerson(BOOL animate)
mCurrentCameraDistance = MIN_CAMERA_DISTANCE;
mTargetCameraDistance = MIN_CAMERA_DISTANCE;
animate = FALSE;
if (gViewerWindow->getRightMouseDown()) LLViewerCamera::instance().loadDefaultFOV(); // <singu/> We could be zoomed in
}
updateLastCamera();
mCameraMode = CAMERA_MODE_THIRD_PERSON;