From ffa55e69086b4d087e07db5f7d3ec638b734c727 Mon Sep 17 00:00:00 2001
From: ziree <none@none>
Date: Thu, 10 Nov 2011 13:15:21 +0100
Subject: [PATCH] make sure to reset the 'currently zooming' flag from
 mouselook zoom on teleport. Stabilizes fix for FIRE-3394

---
 indra/newview/llviewerdisplay.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index 4004ee8447..ed0dfad8c6 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -389,6 +389,10 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 				// replicating the behavior here. -Zi
 				LLViewerCamera::getInstance()->setDefaultFOV(DEFAULT_FIELD_OF_VIEW);
 				gSavedSettings.setF32("CameraAngle", LLViewerCamera::getInstance()->getView());
+				// also, reset the marker for "currently zooming" in the mouselook zoom settings. -Zi
+				LLVector3 vTemp=gSavedSettings.getVector3("_NACL_MLFovValues");
+				vTemp.mV[2]=0.0f;
+				gSavedSettings.setVector3("_NACL_MLFovValues",vTemp);
 			}
 
 			gTeleportDisplayTimer.reset();