1 files 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())