1 files changed, 2 insertions, 20 deletions

diff --git a/linden/indra/newview/llglsandbox.cpp b/linden/indra/newview/llglsandbox.cpp
index e9077a9..3acfbf3 100644
--- a/linden/indra/newview/llglsandbox.cpp
+++ b/linden/indra/newview/llglsandbox.cpp
@@ -71,18 +71,6 @@
  
 BOOL LLAgent::setLookAt(ELookAtType target_type, LLViewerObject *object, LLVector3 position)
 {
-        if (object && target_type != LOOKAT_TARGET_NONE && gSavedSettings.getBOOL("PrivateLookAtTarget"))
-        {
-                target_type = LOOKAT_TARGET_NONE;
-                object = mAvatarObject;
-                position.clearVec();
-                LLViewerObject* source_obj = mLookAt->getSourceObject();
-                if (source_obj)
-                {
-                        mLookAt->setTargetObject(source_obj);
-                }
-        }
-
         if(object && object->isAttachment())
         {
                 LLViewerObject* parent = object;
@@ -109,18 +97,12 @@ BOOL LLAgent::setLookAt(ELookAtType target_type, LLViewerObject *object, LLVecto
 BOOL LLAgent::setPointAt(EPointAtType target_type, LLViewerObject *object, LLVector3 position)
 {
         // disallow pointing at attachments and avatars
-        if (object && (object->isAttachment() || object->isAvatar()))
+        bool private_pointat = gSavedSettings.getBOOL("PrivatePointAtTarget");//this is the arm motion
+        if (object && (object->isAttachment() || object->isAvatar() || private_pointat))
         {
                 return FALSE;
         }
 
-        if (object && target_type != POINTAT_TARGET_NONE && gSavedSettings.getBOOL("PrivateLookAtTarget"))
-        {
-                target_type = POINTAT_TARGET_NONE;
-                object = NULL;
-                position.clearVec();
-        }
-
         if(!mPointAt || mPointAt->isDead())
         {
                 mPointAt = (LLHUDEffectPointAt *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_POINTAT);