From e6c9b6ac5a6e14ae0b05ef686ff242bf818dc65a Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Wed, 8 Sep 2010 05:26:10 -0700
Subject: Ported ResetFocusOnSelfClick debug setting from Emerald, set the
 default to false

---
 linden/indra/newview/app_settings/settings.xml | 11 +++++++++++
 linden/indra/newview/lltoolpie.cpp             |  5 ++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'linden')

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index db44efd..333a780 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -617,6 +617,17 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
+  <key>ResetFocusOnSelfClick</key>
+		<map>
+		<key>Comment</key>
+		<string>Setting this to TRUE resets your camera when you left-click your avatar</string>
+		<key>Persist</key>
+		<integer>1</integer>
+		<key>Type</key>
+		<string>Boolean</string>
+		<key>Value</key>
+		<integer>0</integer>
+		</map>
   <key>RezWithLandGroup</key>
   <map>
     <key>Comment</key>
diff --git a/linden/indra/newview/lltoolpie.cpp b/linden/indra/newview/lltoolpie.cpp
index 262c349..2887515 100644
--- a/linden/indra/newview/lltoolpie.cpp
+++ b/linden/indra/newview/lltoolpie.cpp
@@ -292,7 +292,10 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
 			gViewerWindow->hideCursor();
 			LLToolCamera::getInstance()->setMouseCapture(TRUE);
 			LLToolCamera::getInstance()->pickCallback(mPick);
-			gAgent.setFocusOnAvatar(TRUE, TRUE);
+			if (gSavedSettings.getBOOL("ResetFocusOnSelfClick"))
+			{
+				gAgent.setFocusOnAvatar(TRUE, TRUE);
+			}
 
 			return TRUE;
 		}
-- 
cgit v1.1