diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp
index a704d045ba7747141665f00f21715b2f6038c492..7e8808c1b82d11adba6e877c80c56065c1bd3fe1 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)