diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-06-21 17:39:13 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-06-21 17:39:13 +0100 |
| commit | 2db71067f21f31ce19ef99a3f4b4404f24b2ad0d (patch) | |
| tree | 5a6294e8beb8d9b50e973a962624bf47f234e045 /indra/newview/lltoolfocus.cpp | |
| parent | 3ed3cfce56e9d5c934db350f36ab13c51e3330c1 (diff) | |
| parent | dc07de2f4a4c49d1877bf743b6f0d209392f6eb6 (diff) | |
Merge 5.1.7
Diffstat (limited to 'indra/newview/lltoolfocus.cpp')
| -rw-r--r-- | indra/newview/lltoolfocus.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/lltoolfocus.cpp b/indra/newview/lltoolfocus.cpp index caa055e5e0..596951fdfb 100644 --- a/indra/newview/lltoolfocus.cpp +++ b/indra/newview/lltoolfocus.cpp @@ -222,8 +222,10 @@ void LLToolCamera::pickCallback(const LLPickInfo& pick_info) gAgentCamera.setFocusGlobal(pick_info); } + BOOL zoom_tool = gCameraBtnZoom && (LLToolMgr::getInstance()->getBaseTool() == LLToolCamera::getInstance()); if (!(pick_info.mKeyMask & MASK_ALT) && !LLFloaterCamera::inFreeCameraMode() && + !zoom_tool && gAgentCamera.cameraThirdPerson() && gViewerWindow->getLeftMouseDown() && !gSavedSettings.getBOOL("FreezeTime") && |