1 files changed, 23 insertions, 4 deletions
diff --git a/indra/newview/llviewerjoystick.cpp b/indra/newview/llviewerjoystick.cpp
index e35cb26ce1..2bcec1ecee 100644
--- a/indra/newview/llviewerjoystick.cpp
+++ b/indra/newview/llviewerjoystick.cpp
@@ -806,6 +806,10 @@ void LLViewerJoystick::moveObjects(bool reset)
 		{
 			gAgent.clearAFK();
 		}
+        else
+        {
+            gAwayTriggerTimer.reset();
+        }
 		
 		if (sDelta[0] || sDelta[1] || sDelta[2])
 		{
@@ -980,6 +984,10 @@ void LLViewerJoystick::moveAvatar(bool reset)
 		{
 			gAgent.clearAFK();
 		}
+        else
+        {
+            gAwayTriggerTimer.reset();
+        }
 		
 		setCameraNeedsUpdate(true);
 	}
@@ -1192,10 +1200,17 @@ void LLViewerJoystick::moveFlycam(bool reset)
 	}
 	
 	// Clear AFK state if moved beyond the deadzone
-	if (!is_zero && gAwayTimer.getElapsedTimeF32() > LLAgent::MIN_AFK_TIME)
-	{
-		gAgent.clearAFK();
-	}
+    if (!is_zero)
+    {
+        if (gAwayTimer.getElapsedTimeF32() > LLAgent::MIN_AFK_TIME)
+        {
+            gAgent.clearAFK();
+        }
+        else
+        {
+            gAwayTriggerTimer.reset();
+        }
+    }
 	
 	sFlycamPosition += LLVector3(sDelta) * sFlycamRotation;
 
@@ -1256,6 +1271,10 @@ bool LLViewerJoystick::toggleFlycam()
 	{
 		gAgent.clearAFK();
 	}
+    else
+    {
+        gAwayTriggerTimer.reset();
+    }
 	
 	mOverrideCamera = !mOverrideCamera;
 	if (mOverrideCamera)