summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorandreykproductengine <akleshchev@productengine.com>2016-09-09 16:17:43 +0300
committerandreykproductengine <akleshchev@productengine.com>2016-09-09 16:17:43 +0300
commit8bb95eb8f80bd1c19fc24741cb612ff89ed8ed43 (patch)
treef61ab6900384d5e93fd73c21010f9e8c46f82a3b /indra
parent4a9d6cd69f6e9291c26a389e6a2eeeb140835007 (diff)
MAINT-6711 "Object view" rotates around the avatar
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/lltoolfocus.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/lltoolfocus.cpp b/indra/newview/lltoolfocus.cpp
index c4696c3a01..caa055e5e0 100644
--- a/indra/newview/lltoolfocus.cpp
+++ b/indra/newview/lltoolfocus.cpp
@@ -223,6 +223,7 @@ void LLToolCamera::pickCallback(const LLPickInfo& pick_info)
}
if (!(pick_info.mKeyMask & MASK_ALT) &&
+ !LLFloaterCamera::inFreeCameraMode() &&
gAgentCamera.cameraThirdPerson() &&
gViewerWindow->getLeftMouseDown() &&
!gSavedSettings.getBOOL("FreezeTime") &&