diff options
| author | maxim_productengine <mnikolenko@productengine.com> | 2018-04-04 18:22:34 +0300 |
|---|---|---|
| committer | maxim_productengine <mnikolenko@productengine.com> | 2018-04-04 18:22:34 +0300 |
| commit | faceb7112e189af2ec827f1999c295450198045f (patch) | |
| tree | 28e5c93bc0bc62a6f8de5e630fda2f0e6fe76534 /indra/newview/lltoolfocus.cpp | |
| parent | cb754c60a9431b1118ebac9a0946010ddbed8239 (diff) | |
MAINT-8477 FIXED "Zoom" in build tab rotates around the avatar, instead of zooming
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") && |