1 files changed, 1 insertions, 20 deletions
diff --git a/indra/newview/llviewerjoystick.cpp b/indra/newview/llviewerjoystick.cpp
index 9d45ea24b9..7543fb3743 100644
--- a/indra/newview/llviewerjoystick.cpp
+++ b/indra/newview/llviewerjoystick.cpp
@@ -881,10 +881,6 @@ void LLViewerJoystick::moveObjects(bool reset)
         {
             gAgent.clearAFK();
         }
-        else
-        {
-            gAwayTriggerTimer.reset();
-        }
 
         if (sDelta[0] || sDelta[1] || sDelta[2])
         {
@@ -1059,10 +1055,6 @@ void LLViewerJoystick::moveAvatar(bool reset)
         {
             gAgent.clearAFK();
         }
-        else
-        {
-            gAwayTriggerTimer.reset();
-        }
 
         setCameraNeedsUpdate(true);
     }
@@ -1275,17 +1267,10 @@ void LLViewerJoystick::moveFlycam(bool reset)
     }
 
     // Clear AFK state if moved beyond the deadzone
-    if (!is_zero)
-    {
-        if (gAwayTimer.getElapsedTimeF32() > LLAgent::MIN_AFK_TIME)
+    if (!is_zero && gAwayTimer.getElapsedTimeF32() > LLAgent::MIN_AFK_TIME)
     {
         gAgent.clearAFK();
     }
-        else
-        {
-            gAwayTriggerTimer.reset();
-        }
-    }
 
     sFlycamPosition += LLVector3(sDelta) * sFlycamRotation;
 
@@ -1346,10 +1331,6 @@ bool LLViewerJoystick::toggleFlycam()
     {
         gAgent.clearAFK();
     }
-    else
-    {
-        gAwayTriggerTimer.reset();
-    }
 
     mOverrideCamera = !mOverrideCamera;
     if (mOverrideCamera)