From 64358b62e210419b85318a6741bfbbdcf1ac52ec Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sat, 5 Jun 2010 19:48:10 -0700
Subject: Made PrivateLookAtTarget actually disable sending your show look at
 info with the CV patch

---
 linden/indra/newview/llglsandbox.cpp | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/linden/indra/newview/llglsandbox.cpp b/linden/indra/newview/llglsandbox.cpp
index a316069..e9077a9 100644
--- a/linden/indra/newview/llglsandbox.cpp
+++ b/linden/indra/newview/llglsandbox.cpp
@@ -73,11 +73,13 @@ BOOL LLAgent::setLookAt(ELookAtType target_type, LLViewerObject *object, LLVecto
 {
 	if (object && target_type != LOOKAT_TARGET_NONE && gSavedSettings.getBOOL("PrivateLookAtTarget"))
 	{
-		if ((object->getPositionGlobal() - gAgent.getPositionGlobal()).magVec() > 20.0)
+		target_type = LOOKAT_TARGET_NONE;
+		object = mAvatarObject;
+		position.clearVec();
+		LLViewerObject* source_obj = mLookAt->getSourceObject();
+		if (source_obj)
 		{
-			target_type = LOOKAT_TARGET_NONE;
-			object = mAvatarObject;
-			position.clearVec();
+			mLookAt->setTargetObject(source_obj);
 		}
 	}
 
@@ -114,12 +116,9 @@ BOOL LLAgent::setPointAt(EPointAtType target_type, LLViewerObject *object, LLVec
 
 	if (object && target_type != POINTAT_TARGET_NONE && gSavedSettings.getBOOL("PrivateLookAtTarget"))
 	{
-		if ((object->getPositionGlobal() - gAgent.getPositionGlobal()).magVec() > 20.0)
-		{
-			target_type = POINTAT_TARGET_NONE;
-			object = NULL;
-			position.clearVec();
-		}
+		target_type = POINTAT_TARGET_NONE;
+		object = NULL;
+		position.clearVec();
 	}
 
 	if(!mPointAt || mPointAt->isDead())
-- 
cgit v1.1