From 8bb95eb8f80bd1c19fc24741cb612ff89ed8ed43 Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Fri, 9 Sep 2016 16:17:43 +0300
Subject: [PATCH] MAINT-6711 "Object view" rotates around the avatar

---
 indra/newview/lltoolfocus.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indra/newview/lltoolfocus.cpp b/indra/newview/lltoolfocus.cpp
index c4696c3a012..caa055e5e08 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") &&
-- 
GitLab