Skip to content

Commit aae33e4

Browse files
FelixWolfakleshchev
authored andcommitted
It's a target, not a hint
1 parent c7baab3 commit aae33e4

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

indra/newview/app_settings/settings.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16256,18 +16256,18 @@
1625616256
<key>Value</key>
1625716257
<integer>1</integer>
1625816258
</map>
16259-
<key>EnableLookAtHints</key>
16259+
<key>EnableLookAtTarget</key>
1626016260
<map>
1626116261
<key>Comment</key>
16262-
<string>Whether or not to send animate the avatar head and send look at hints when moving the cursor or focusing on objects</string>
16262+
<string>Whether or not to send animate the avatar head and send look at targets when moving the cursor or focusing on objects</string>
1626316263
<key>Persist</key>
1626416264
<integer>1</integer>
1626516265
<key>Type</key>
1626616266
<string>Boolean</string>
1626716267
<key>Value</key>
1626816268
<integer>1</integer>
1626916269
</map>
16270-
<key>LimitLookAtHints</key>
16270+
<key>LimitLookAtTarget</key>
1627116271
<map>
1627216272
<key>Comment</key>
1627316273
<string>Whether or not to clamp the look at targets around the avatar head before sending</string>
@@ -16278,7 +16278,7 @@
1627816278
<key>Value</key>
1627916279
<integer>0</integer>
1628016280
</map>
16281-
<key>LimitLookAtHintsDistance</key>
16281+
<key>LimitLookAtTargetDistance</key>
1628216282
<map>
1628316283
<key>Comment</key>
1628416284
<string>Distance to limit look at target to</string>

indra/newview/llhudeffectlookat.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ bool LLHUDEffectLookAt::setLookAt(ELookAtType target_type, LLViewerObject *objec
398398
return false;
399399
}
400400

401-
static LLCachedControl<bool> enable_lookat_hints(gSavedSettings, "EnableLookAtHints", true);
401+
static LLCachedControl<bool> enable_lookat_hints(gSavedSettings, "EnableLookAtTarget", true);
402402
if (!enable_lookat_hints)
403403
{
404404
if (mTargetType != LOOKAT_TARGET_IDLE)
@@ -424,7 +424,7 @@ bool LLHUDEffectLookAt::setLookAt(ELookAtType target_type, LLViewerObject *objec
424424
return false;
425425
}
426426

427-
static LLCachedControl<bool> limit_lookat_hints(gSavedSettings, "LimitLookAtHints", true);
427+
static LLCachedControl<bool> limit_lookat_hints(gSavedSettings, "LimitLookAtTarget", true);
428428
// Don't affect the look at if object is gAgentAvatarp (cursor head follow)
429429
if (limit_lookat_hints && object != gAgentAvatarp)
430430
{
@@ -438,7 +438,7 @@ bool LLHUDEffectLookAt::setLookAt(ELookAtType target_type, LLViewerObject *objec
438438
LLVector3 agentHeadPosition = gAgentAvatarp->mHeadp->getWorldPosition();
439439
float dist = (float)dist_vec(agentHeadPosition, position);
440440

441-
static LLCachedControl<F32> limit_lookat_hints_distance(gSavedSettings, "LimitLookAtHintsDistance", 2.0f);
441+
static LLCachedControl<F32> limit_lookat_hints_distance(gSavedSettings, "LimitLookAtTargetDistance", 2.0f);
442442
if (dist > limit_lookat_hints_distance)
443443
{
444444
LLVector3 headOffset = position - agentHeadPosition;

indra/newview/skins/default/xui/en/panel_preferences_privacy.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,17 +75,17 @@
7575
top_pad="10"
7676
width="350" />
7777
<check_box
78-
control_name="EnableLookAtHints"
78+
control_name="EnableLookAtTarget"
7979
height="16"
8080
label="Enable LookAt"
8181
layout="topleft"
8282
left="30"
83-
name="enable_lookat_hints"
83+
name="enable_lookat_target"
8484
top_pad="10"
8585
width="350" />
8686
<check_box
87-
enabled_control="EnableLookAtHints"
88-
control_name="LimitLookAtHints"
87+
enabled_control="EnableLookAtTarget"
88+
control_name="LimitLookAtTarget"
8989
height="16"
9090
label="Limit LookAt Distance"
9191
layout="topleft"

0 commit comments

Comments
 (0)