diff --git a/indra/newview/app_settings/settings_alchemy.xml b/indra/newview/app_settings/settings_alchemy.xml
index 40499069ed917fc09f47cd85c4d268ecd9a5d180..a34e06d698719774575a730f197d62f84de3c9ba 100644
--- a/indra/newview/app_settings/settings_alchemy.xml
+++ b/indra/newview/app_settings/settings_alchemy.xml
@@ -467,7 +467,7 @@
     <key>AlchemyLookAtPrivate</key>
     <map>
       <key>Comment</key>
-      <string>[OBSOLETE]</string>
+      <string>Disable broadcast of own look at to other users.</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp
index 4f8d040cba471cf0c502bfc3a35eb20c41462944..1238d8cd7aa23ee360b1cf3741eb8450c33c07ec 100644
--- a/indra/newview/llagentcamera.cpp
+++ b/indra/newview/llagentcamera.cpp
@@ -2965,7 +2965,14 @@ void LLAgentCamera::setFocusOnAvatar(BOOL focus_on_avatar, BOOL animate, BOOL re
 
 BOOL LLAgentCamera::setLookAt(ELookAtType target_type, LLViewerObject *object, LLVector3 position)
 {
-	if(object && object->isAttachment())
+	static LLCachedControl<bool> isPrivate(gSavedSettings, "AlchemyLookAtPrivate", false);
+	if (isPrivate)
+	{
+		target_type = LOOKAT_TARGET_NONE;
+		object = gAgentAvatarp;
+		position.clearVec();
+	}
+	else if(object && object->isAttachment())
 	{
 		LLViewerObject* parent = object;
 		while(parent)
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 c1b6d421e0d1f1d469bbe7f168f7e925a057c53e..1c722525fa561ac5a8ef2326f579501a3533319a 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -143,10 +143,20 @@
          text_color="LtGray_50">
             My LookAt:
         </text>
+        <check_box
+         control_name="AlchemyLookAtPrivate"
+         height="16"
+         label="Don't send my Look At target to others"
+         layout="topleft"
+         left="30"
+         name="privatelookat"
+         tool_tip="Disable your camera focus point from showing to others"
+         width="350" />
         <check_box
          control_name="AlchemyLookAtClampEnabled"
+         disabled_control="AlchemyLookAtPrivate"
          height="16"
-         label="Limit camera target distance"
+         label="Limit Look At distance from avatar head"
          layout="topleft"
          left="30"
          name="privatelookat"
@@ -160,6 +170,7 @@
             max_val="128"
             follows="top|left"
             control_name="AlchemyLookAtClampDistance"
+            disabled_control="AlchemyLookAtPrivate"
             initial_value="1.0"
             increment="0.5"
             label="Max Distance"