diff options
author | Xiaohong Bao <bao@lindenlab.com> | 2011-05-10 13:57:41 -0600 |
---|---|---|
committer | Xiaohong Bao <bao@lindenlab.com> | 2011-05-10 13:57:41 -0600 |
commit | 2a61d908e790bfd554f3f0968b320a6e2f4d42c4 (patch) | |
tree | 9e7cd6854a5e6b6c8d6cea31d9d4a8b8f649af7e /indra/newview/llagent.cpp | |
parent | e32d1cf7564dd38664781ea7360fa8daa132961c (diff) | |
parent | b5c834c6fdcee7d7238bebfc561ecee3ecca3589 (diff) |
Merge
Diffstat (limited to 'indra/newview/llagent.cpp')
-rw-r--r-- | indra/newview/llagent.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 7d908df5ce..7d491a7774 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -1119,12 +1119,6 @@ void LLAgent::resetControlFlags() //----------------------------------------------------------------------------- void LLAgent::setAFK() { - // Drones can't go AFK - if (gNoRender) - { - return; - } - if (!gAgent.getRegion()) { // Don't set AFK if we're not talking to a region yet. @@ -1684,11 +1678,6 @@ void LLAgent::clearRenderState(U8 clearstate) //----------------------------------------------------------------------------- U8 LLAgent::getRenderState() { - if (gNoRender || gKeyboard == NULL) - { - return 0; - } - // *FIX: don't do stuff in a getter! This is infinite loop city! if ((mTypingTimer.getElapsedTimeF32() > TYPING_TIMEOUT_SECS) && (mRenderState & AGENT_STATE_TYPING)) |