From 5463948f1103af9dfa8dd1fc62dfae8ed77da8b8 Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Tue, 20 Oct 2026 22:01:23 +0300 Subject: #6467 fix camera returning to previous position after Alt-clicking an object --- indra/newview/llagentcamera.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/newview/llagentcamera.cpp') diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index 13878f9448..31db33caa9 100644 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -1506,11 +1506,13 @@ void LLAgentCamera::updateCamera() { // Keep tracked-object translation exact and smooth only changes // to the camera offset, as is done in avatar-relative mode. + // Skip during the focus-change pan indicated by mCameraAnimating, see #6467. LLVector3d camera_pos_focus = camera_pos_global - mFocusGlobal; LLVector3d last_camera_pos_focus = mCameraSmoothingLastPositionGlobal - mCameraSmoothingLastFocusGlobal; LLVector3d delta = camera_pos_focus - last_camera_pos_focus; - if (mCameraSmoothingLastFocusValid && + if (!mCameraAnimating && + mCameraSmoothingLastFocusValid && delta.magVec() < MAX_CAMERA_SMOOTH_DISTANCE) { camera_pos_focus = lerp(last_camera_pos_focus, camera_pos_focus, smoothing); -- cgit v1.3