diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-09-16 09:07:20 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-09-16 09:07:20 -0400 |
| commit | 2fba01d160716b886a7dfc0c86abda767a25d23f (patch) | |
| tree | 7fdbcb9a874648d3f3ea372433ddb94853f39284 /indra/newview/llagent.cpp | |
| parent | 1a0865a57220434a49b106a47170c3dae45dcb13 (diff) | |
| parent | 7a60aa91f4d49ba1713122ec3bba670acf55f795 (diff) | |
merge changes for storm-1578
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rwxr-xr-x | indra/newview/llagent.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 642a1907f0..296ae8f10b 100755 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -107,7 +107,6 @@ const F64 CHAT_AGE_FAST_RATE = 3.0; const F32 MIN_FIDGET_TIME = 8.f; // seconds const F32 MAX_FIDGET_TIME = 20.f; // seconds - // The agent instance. LLAgent gAgent; @@ -115,6 +114,9 @@ LLAgent gAgent; // Statics // +/// minimum time after setting away state before coming back based on movement +const F32 LLAgent::MIN_AFK_TIME = 10.0f; + const F32 LLAgent::TYPING_TIMEOUT_SECS = 5.f; std::map<std::string, std::string> LLAgent::sTeleportErrorMessages; @@ -1165,6 +1167,7 @@ void LLAgent::setAFK() { sendAnimationRequest(ANIM_AGENT_AWAY, ANIM_REQUEST_START); setControlFlags(AGENT_CONTROL_AWAY | AGENT_CONTROL_STOP); + LL_INFOS("AFK") << "Setting Away" << LL_ENDL; gAwayTimer.start(); if (gAFKMenu) { @@ -1188,6 +1191,7 @@ void LLAgent::clearAFK() { sendAnimationRequest(ANIM_AGENT_AWAY, ANIM_REQUEST_STOP); clearControlFlags(AGENT_CONTROL_AWAY); + LL_INFOS("AFK") << "Clearing Away" << LL_ENDL; if (gAFKMenu) { gAFKMenu->setLabel(LLTrans::getString("AvatarSetAway")); |