From e5fcd54c923c90cc3497c45f74a58ce54e3251ba Mon Sep 17 00:00:00 2001
From: Drake Arconis <lightdrake@gmail.com>
Date: Tue, 12 Nov 2013 23:47:28 -0500
Subject: [PATCH] Add option to disable scroll offset changing modifier

---
 indra/newview/app_settings/settings.xml | 12 +++++++++++-
 indra/newview/llagentcamera.cpp         |  3 ++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 98366cb6e..6f1a98444 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -8,7 +8,17 @@
 		<string>settings_sh.xml</string>
 		<string>settings_rlv.xml</string>
 	</array>
-
+    <key>SinguOffsetScrollKeys</key>
+    <map>
+      <key>Comment</key>
+      <string>Enable keys to modify camera and focus offsets</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>PhoenixIMAnnounceStealFocus</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp
index 5cd4c780e..5f979de31 100644
--- a/indra/newview/llagentcamera.cpp
+++ b/indra/newview/llagentcamera.cpp
@@ -2075,7 +2075,8 @@ void LLAgentCamera::handleScrollWheel(S32 clicks)
 		{
 			if (MASK mask = gKeyboard->currentMask(true)) // Singu Note: Conveniently set view offsets while modifier keys are held during scroll
 			{
-				if (mask & MASK_CONTROL|MASK_SHIFT)
+				static const LLCachedControl<bool> enableCameraOffsetScroll("SinguOffsetScrollKeys");
+				if (mask & MASK_CONTROL|MASK_SHIFT && enableCameraOffsetScroll)
 				{
 					const F32 change(static_cast<F32>(clicks) * 0.1f);
 					if (mask & MASK_SHIFT)