Merge commit '15908fd34e' into marchcat/c-develop

# Conflicts:
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltexteditor.h
#	indra/newview/llappviewer.cpp
#	indra/newview/llconversationlog.cpp
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llimview.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llsidepaneliteminfo.cpp
#	indra/newview/llviewerjoystick.cpp
#	indra/newview/llviewerwindow.cpp
#	indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml

1 files changed, 21 insertions, 2 deletions

diff --git a/indra/newview/llviewerjoystick.cpp b/indra/newview/llviewerjoystick.cpp
index 416f6a476a..ffd595fd3b 100644
--- a/indra/newview/llviewerjoystick.cpp
+++ b/indra/newview/llviewerjoystick.cpp
@@ -880,6 +880,10 @@ void LLViewerJoystick::moveObjects(bool reset)
         {
             gAgent.clearAFK();
         }
+        else
+        {
+            gAwayTriggerTimer.reset();
+        }
 
         if (sDelta[0] || sDelta[1] || sDelta[2])
         {
@@ -1054,6 +1058,10 @@ void LLViewerJoystick::moveAvatar(bool reset)
         {
             gAgent.clearAFK();
         }
+        else
+        {
+            gAwayTriggerTimer.reset();
+        }
 
         setCameraNeedsUpdate(true);
     }
@@ -1266,9 +1274,16 @@ void LLViewerJoystick::moveFlycam(bool reset)
     }
 
     // Clear AFK state if moved beyond the deadzone
-    if (!is_zero && gAwayTimer.getElapsedTimeF32() > LLAgent::MIN_AFK_TIME)
+    if (!is_zero)
     {
-        gAgent.clearAFK();
+        if (gAwayTimer.getElapsedTimeF32() > LLAgent::MIN_AFK_TIME)
+        {
+            gAgent.clearAFK();
+        }
+        else
+        {
+            gAwayTriggerTimer.reset();
+        }
     }
 
     sFlycamPosition += LLVector3(sDelta) * sFlycamRotation;
@@ -1330,6 +1345,10 @@ bool LLViewerJoystick::toggleFlycam()
     {
         gAgent.clearAFK();
     }
+    else
+    {
+        gAwayTriggerTimer.reset();
+    }
 
     mOverrideCamera = !mOverrideCamera;
     if (mOverrideCamera)