From fcdf29bd0f8c4e3ec45cd0788bca14b9005cfa93 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Mon, 1 Jan 2024 17:39:00 -0500
Subject: [PATCH] Preserve camera roll on movement option thing

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

diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp
index a704d045ba7..7e8808c1b82 100644
--- a/indra/newview/llagentcamera.cpp
+++ b/indra/newview/llagentcamera.cpp
@@ -374,10 +374,11 @@ void LLAgentCamera::resetView(BOOL reset_camera, BOOL change_camera)
 		setFocusOnAvatar(TRUE, ANIMATE);
 
 		mCameraFOVZoomFactor = 0.f;
+
+		resetCameraRoll();
 	}
 	resetPanDiff();
 	resetOrbitDiff();
-	resetCameraRoll();
 	mHUDTargetZoom = 1.f;
 
     if (LLSelectMgr::getInstance()->mAllowSelectAvatar)
-- 
GitLab