From 0a3a4a51bd24bb00f64144570ae1268c96436805 Mon Sep 17 00:00:00 2001
From: Lirusaito <Inusaito@gmail.com>
Date: Sun, 25 May 2014 12:44:48 -0400
Subject: [PATCH] Feature Request: Add an option to "Make rightclick zoom
 instantaneous, not smooth" (in Input & Camera preferences)

---
 indra/newview/app_settings/settings.xml               | 11 +++++++++++
 indra/newview/lltoolcomp.cpp                          |  3 +++
 .../default/xui/en-us/panel_preferences_input.xml     |  1 +
 3 files changed, 15 insertions(+)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index accc2a070..247ebaee8 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -867,6 +867,17 @@
       <key>Value</key>
       <boolean>1</boolean>
     </map>
+    <key>LiruMouselookInstantZoom</key>
+    <map>
+      <key>Comment</key>
+      <string>Whether or not the right click zoom in mouselook will be instant or smoothly transition between zooms</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <boolean>0</boolean>
+    </map>
     <key>LiruMouselookMenu</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/lltoolcomp.cpp b/indra/newview/lltoolcomp.cpp
index 2c442069e..44c8c4a0e 100644
--- a/indra/newview/lltoolcomp.cpp
+++ b/indra/newview/lltoolcomp.cpp
@@ -783,6 +783,7 @@ BOOL LLToolCompGun::handleRightMouseUp(S32 x, S32 y, MASK mask)
 
 		mStartFOV = LLViewerCamera::getInstance()->getDefaultFOV();
 		mTargetFOV = mOriginalFOV;
+		gSavedSettings.getBOOL("LiruMouselookInstantZoom") ? LLViewerCamera::getInstance()->setDefaultFOV(mTargetFOV) :
 		mTimerFOV.start();
 	}
 
@@ -814,6 +815,7 @@ BOOL LLToolCompGun::handleRightMouseDown(S32 x, S32 y, MASK mask)
 	else mStartFOV = LLViewerCamera::getInstance()->getDefaultFOV();
 
 	mTargetFOV = gSavedSettings.getF32("ExodusAlternativeFOV");
+	gSavedSettings.getBOOL("LiruMouselookInstantZoom") ? LLViewerCamera::getInstance()->setDefaultFOV(mTargetFOV) :
 	mTimerFOV.start();
 
 	return TRUE;
@@ -832,6 +834,7 @@ BOOL LLToolCompGun::handleScrollWheel(S32 x, S32 y, S32 clicks)
 				llclamp(mTargetFOV -= (0.05f * -clicks), 0.1f, 3.0f)
 		);
 
+		gSavedSettings.getBOOL("LiruMouselookInstantZoom") ? LLViewerCamera::getInstance()->setDefaultFOV(mTargetFOV) :
 		mTimerFOV.start();
 	}
 	else if (clicks > 0) gAgentCamera.changeCameraToDefault();
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
index b5252a17a..464f60645 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
@@ -4,6 +4,7 @@
 	<text bottom="-20" follows="top" height="10" left="148" name=" Mouse Sensitivity:">Mouse Sensitivity:</text>
 	<slider_bar bottom="-26" follows="top" height="16" increment="0.25" initial_val="2" left="276" max_val="15" min_val="0" name="mouse_sensitivity" width="128"/>
 	<check_box bottom_delta="-18" follows="top" height="16" label="Invert Mouse" left="148" name="invert_mouse"/>
+	<check_box bottom_delta="-18" follows="top" height="16" control_name="LiruMouselookInstantZoom" label="Make rightclick zoom instantaneous, not smooth" name="instant_zoom"/>
 	<check_box bottom_delta="-18" follows="top" height="16" initial_value="false" label="Show Avatar in Mouselook" name="first_person_avatar_visible"/>
 	<check_box bottom_delta="-18" follows="top" height="16" control_name="UseRealisticMouselook" label="Use 'realistic' Camera behavior in Mouselook" name="UseRealisticMouselook"/>
 	<text bottom_delta="-18" follows="top" height="16" name="UI Hidden in mouselook:">UI Hidden in mouselook:</text>