From 9666a96e68cb6b75031051fc43f44b2c566b135c Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Tue, 15 Oct 2019 15:56:40 +0300
Subject: [PATCH] SL-12115 FIXED The camera flies away when sitting on a new
 object with edit mode enabled

---
 indra/newview/llvoavatar.cpp | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index f861c0cecf5..a974c66ee4d 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -7331,13 +7331,6 @@ void LLVOAvatar::sitOnObject(LLViewerObject *sit_object)
                 if (root_object == sit_object)
                 {
                     LLFloaterTools::sPreviousFocusOnAvatar = true;
-                    if (!gSavedSettings.getBOOL("EditCameraMovement"))
-                    {
-                        // always freeze camera in space, even if camera doesn't move
-                        // so, for example, follow cam scripts can't affect you when in build mode
-                        gAgentCamera.setFocusGlobal(gAgentCamera.calcFocusPositionTargetGlobal(), LLUUID::null);
-                        gAgentCamera.setFocusOnAvatar(FALSE, ANIMATE);
-                    }
                 }
             }
         }
-- 
GitLab