From dde18dfc0f6dec925717d02277418eb61f1687a3 Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Mon, 21 Oct 2013 16:01:31 -0400
Subject: [PATCH] Added a setting, LiruMouselookMenu, in case people don't want
 this feature.

---
 indra/newview/app_settings/settings.xml | 11 +++++++++++
 indra/newview/lltoolcomp.cpp            |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index c1f005aba..1fce571f3 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -786,6 +786,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>LiruMouselookMenu</key>
+    <map>
+      <key>Comment</key>
+      <string>Controls if holding Alt and right clicking in mouselook will bring up a menu</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <boolean>1</boolean>
+    </map>
     <key>LiruNewARCLimit</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/lltoolcomp.cpp b/indra/newview/lltoolcomp.cpp
index f5459d867..9d520eaef 100644
--- a/indra/newview/lltoolcomp.cpp
+++ b/indra/newview/lltoolcomp.cpp
@@ -764,7 +764,7 @@ BOOL LLToolCompGun::handleRightMouseDown(S32 x, S32 y, MASK mask)
 	// be shown.
 	return FALSE;
 	*/
-	if (mask & MASK_ALT) return false;
+	if (gSavedSettings.getBOOL("LiruMouselookMenu") && mask & MASK_ALT) return false;
 
 	// Returning true will suppress the context menu
 	return TRUE;