1 files changed, 9 insertions, 2 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index b8515fd92b..1c6544f3f9 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -6120,11 +6120,18 @@ void process_teleport_local(LLMessageSystem *msg,void**)
     }
 
     gAgent.setPositionAgent(pos);
-    gAgentCamera.slamLookAt(look_at);
+
+    bool keep_camera_local_tp = gSavedSettings.getBOOL("KeepCameraOnLocalTeleport");
+
+    if (!keep_camera_local_tp)
+    {
+        gAgentCamera.slamLookAt(look_at);
+    }
 
     if ( !(gAgent.getTeleportKeepsLookAt() && LLViewerJoystick::getInstance()->getOverrideCamera()) )
     {
-        gAgentCamera.resetView(true, true);
+        // resetView still runs (cleanup); the false args just leave the camera alone.
+        gAgentCamera.resetView(!keep_camera_local_tp, !keep_camera_local_tp);
     }
 
     // send camera update to new region