diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp
index dfe53e4756..e01e89bd27 100644
--- a/indra/newview/llagentcamera.cpp
+++ b/indra/newview/llagentcamera.cpp
@@ -2662,7 +2662,16 @@ void LLAgentCamera::setFocusOnAvatar(BOOL focus_on_avatar, BOOL animate)
 
 BOOL LLAgentCamera::setLookAt(ELookAtType target_type, LLViewerObject *object, LLVector3 position)
 {
-	if(object && object->isAttachment())
+//	if(object && object->isAttachment())
+	static LLCachedControl<bool> is_private(gSavedSettings, "PrivateLookAtTarget", false);
+
+	if(is_private)
+	{
+		position.clearVec();
+		target_type = LOOKAT_TARGET_NONE;
+		object = gAgentAvatarp;
+	}
+	else if(object && object->isAttachment())
 	{
 		LLViewerObject* parent = object;
 		while(parent)