summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyler Eastridge <felix.wolfz@gmail.com>2025-07-28 04:46:05 +0100
committerAndrey Kleshchev <117672381+akleshchev@users.noreply.github.com>2025-07-29 20:12:46 +0300
commitaae33e4ef236359722fc8f0bfe4040392eaa3420 (patch)
tree82f3fca450e7024bf4bf9d5c63ac6cf341e19388
parentc7baab39264e1352386da6f7d1be99b2ed855a19 (diff)
It's a target, not a hint
-rw-r--r--indra/newview/app_settings/settings.xml8
-rw-r--r--indra/newview/llhudeffectlookat.cpp6
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_privacy.xml8
3 files changed, 11 insertions, 11 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 28240f50c6..2241bb89a4 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -16256,10 +16256,10 @@
<key>Value</key>
<integer>1</integer>
</map>
- <key>EnableLookAtHints</key>
+ <key>EnableLookAtTarget</key>
<map>
<key>Comment</key>
- <string>Whether or not to send animate the avatar head and send look at hints when moving the cursor or focusing on objects</string>
+ <string>Whether or not to send animate the avatar head and send look at targets when moving the cursor or focusing on objects</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -16267,7 +16267,7 @@
<key>Value</key>
<integer>1</integer>
</map>
- <key>LimitLookAtHints</key>
+ <key>LimitLookAtTarget</key>
<map>
<key>Comment</key>
<string>Whether or not to clamp the look at targets around the avatar head before sending</string>
@@ -16278,7 +16278,7 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>LimitLookAtHintsDistance</key>
+ <key>LimitLookAtTargetDistance</key>
<map>
<key>Comment</key>
<string>Distance to limit look at target to</string>
diff --git a/indra/newview/llhudeffectlookat.cpp b/indra/newview/llhudeffectlookat.cpp
index e7894e6c84..f995048210 100644
--- a/indra/newview/llhudeffectlookat.cpp
+++ b/indra/newview/llhudeffectlookat.cpp
@@ -398,7 +398,7 @@ bool LLHUDEffectLookAt::setLookAt(ELookAtType target_type, LLViewerObject *objec
return false;
}
- static LLCachedControl<bool> enable_lookat_hints(gSavedSettings, "EnableLookAtHints", true);
+ static LLCachedControl<bool> enable_lookat_hints(gSavedSettings, "EnableLookAtTarget", true);
if (!enable_lookat_hints)
{
if (mTargetType != LOOKAT_TARGET_IDLE)
@@ -424,7 +424,7 @@ bool LLHUDEffectLookAt::setLookAt(ELookAtType target_type, LLViewerObject *objec
return false;
}
- static LLCachedControl<bool> limit_lookat_hints(gSavedSettings, "LimitLookAtHints", true);
+ static LLCachedControl<bool> limit_lookat_hints(gSavedSettings, "LimitLookAtTarget", true);
// Don't affect the look at if object is gAgentAvatarp (cursor head follow)
if (limit_lookat_hints && object != gAgentAvatarp)
{
@@ -438,7 +438,7 @@ bool LLHUDEffectLookAt::setLookAt(ELookAtType target_type, LLViewerObject *objec
LLVector3 agentHeadPosition = gAgentAvatarp->mHeadp->getWorldPosition();
float dist = (float)dist_vec(agentHeadPosition, position);
- static LLCachedControl<F32> limit_lookat_hints_distance(gSavedSettings, "LimitLookAtHintsDistance", 2.0f);
+ static LLCachedControl<F32> limit_lookat_hints_distance(gSavedSettings, "LimitLookAtTargetDistance", 2.0f);
if (dist > limit_lookat_hints_distance)
{
LLVector3 headOffset = position - agentHeadPosition;
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
index c651d58f3b..bbd2ac367e 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -75,17 +75,17 @@
top_pad="10"
width="350" />
<check_box
- control_name="EnableLookAtHints"
+ control_name="EnableLookAtTarget"
height="16"
label="Enable LookAt"
layout="topleft"
left="30"
- name="enable_lookat_hints"
+ name="enable_lookat_target"
top_pad="10"
width="350" />
<check_box
- enabled_control="EnableLookAtHints"
- control_name="LimitLookAtHints"
+ enabled_control="EnableLookAtTarget"
+ control_name="LimitLookAtTarget"
height="16"
label="Limit LookAt Distance"
layout="topleft"