summaryrefslogtreecommitdiff
path: root/indra/newview/llagent.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2011-03-21 17:40:49 -0400
committerNat Goodspeed <nat@lindenlab.com>2011-03-21 17:40:49 -0400
commitfa4359e571fb67aca651efc3403274cdf0bb2616 (patch)
tree029261cf0981e0472f2bd34bbae20dbcfbc26925 /indra/newview/llagent.cpp
parent3f3429fa6854c6462abf3bbabf4af1dbbeb4c337 (diff)
parentb9a9b0017dd4714cbca4b0ddb69ed5e6b2f09528 (diff)
STORM-1051: merge daggy fix to tip
Diffstat (limited to 'indra/newview/llagent.cpp')
-rw-r--r--indra/newview/llagent.cpp11
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))