From 7932a77319c629c16f3bc1217dd04167c5687ae4 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Tue, 1 Jul 2014 11:01:43 +0300
Subject: MAINT-3885 FIXED Don't set focus on avatar after
 double-click-teleport if camera was locked.

---
 indra/newview/llagentcamera.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'indra/newview/llagentcamera.cpp')

diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp
index 7b0496ea45..2356a84688 100755
--- a/indra/newview/llagentcamera.cpp
+++ b/indra/newview/llagentcamera.cpp
@@ -2721,6 +2721,11 @@ void LLAgentCamera::lookAtLastChat()
 	}
 }
 
+bool LLAgentCamera::isfollowCamLocked()
+{
+	return mFollowCam.getPositionLocked();
+}
+
 BOOL LLAgentCamera::setPointAt(EPointAtType target_type, LLViewerObject *object, LLVector3 position)
 {
 	// disallow pointing at attachments and avatars
-- 
cgit v1.2.3