Downstream merge from lindenlab/viewer-serval

1 files changed, 0 insertions, 7 deletions

diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 37ad7a53a8..e42a7269b4 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -7334,13 +7334,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);
-                    }
                 }
             }
         }