diff options
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 11 | ||||
| -rw-r--r-- | indra/newview/llhudeffectlookat.cpp | 6 | 
2 files changed, 17 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index d002966573..c416944a24 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -16256,5 +16256,16 @@        <key>Value</key>        <integer>1</integer>      </map> +    <key>EnableLookAtHints</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> +      <key>Persist</key> +      <integer>1</integer> +      <key>Type</key> +      <string>Boolean</string> +      <key>Value</key> +      <integer>1</integer> +    </map>  </map>  </llsd> diff --git a/indra/newview/llhudeffectlookat.cpp b/indra/newview/llhudeffectlookat.cpp index d0d2ee191a..845a003500 100644 --- a/indra/newview/llhudeffectlookat.cpp +++ b/indra/newview/llhudeffectlookat.cpp @@ -392,6 +392,12 @@ void LLHUDEffectLookAt::setTargetPosGlobal(const LLVector3d &target_pos_global)  //-----------------------------------------------------------------------------  bool LLHUDEffectLookAt::setLookAt(ELookAtType target_type, LLViewerObject *object, LLVector3 position)  { +    static LLCachedControl<bool> enable_lookat_hints(gSavedSettings, "EnableLookAtHints", true); +    if (!enable_lookat_hints) +    { +        return false; +    } +      if (!mSourceObject)      {          return false;  | 
