From bdca6c75f0d6c1856ed24bb2118d55414a480903 Mon Sep 17 00:00:00 2001
From: Drake Arconis <drake@alchemyviewer.org>
Date: Wed, 19 Aug 2015 15:12:00 -0400
Subject: [PATCH] ALCH-193 - Add an option to disable the forced camera refocus
on self-avatar-click
---
indra/newview/app_settings/settings_alchemy.xml | 11 +++++++++++
indra/newview/lltoolpie.cpp | 3 ++-
.../skins/default/xui/en/panel_preferences_move.xml | 11 +++++++++++
3 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/indra/newview/app_settings/settings_alchemy.xml b/indra/newview/app_settings/settings_alchemy.xml
index 39dff1609a..f35720fe16 100644
--- a/indra/newview/app_settings/settings_alchemy.xml
+++ b/indra/newview/app_settings/settings_alchemy.xml
@@ -24,6 +24,17 @@
<key>Value</key>
<integer>0</integer>
</map>
+ <key>AlchemyAvatarClickFocus</key>
+ <map>
+ <key>Comment</key>
+ <string>Clicking on avatar resets camera focus</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
<key>AlchemyAvatarListNameFormat</key>
<map>
<key>Comment</key>
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index abf65f5a98..1bd9017e19 100755
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -356,7 +356,8 @@ BOOL LLToolPie::handleLeftClickPick()
gViewerWindow->hideCursor();
LLToolCamera::getInstance()->setMouseCapture(TRUE);
LLToolCamera::getInstance()->pickCallback(mPick);
- gAgentCamera.setFocusOnAvatar(TRUE, TRUE);
+ BOOL focus = gSavedSettings.getBOOL("AlchemyAvatarClickFocus");
+ gAgentCamera.setFocusOnAvatar(focus, focus);
return TRUE;
}
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
index 65e922bedc..6a3f045dba 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -231,6 +231,17 @@
tool_tip="Don't run certain animations, such as landing to appear more nimble"
width="280"
top_pad="2" />
+ <check_box
+ control_name="AlchemyAvatarClickFocus"
+ height="16"
+ follows="left|top"
+ label="Avatar Click Focus"
+ layout="topleft"
+ left_delta="0"
+ name="ClickFocus"
+ tool_tip="Focus the camera on your avatar when clicked"
+ width="280"
+ top_pad="2" />
<!-- End Column #2 -->
<icon
follows="left|top"
--
GitLab