diff options
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 53929051da..b7257a6c50 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -4982,28 +4982,15 @@ void LLAgent::renderAutoPilotTarget() } } -void LLAgent::setExternalActionFlags(U32 outer_flags) -{ - if (LLGameControl::willControlAvatar()) - { - // save these flags for later, for when we're ready - // to actually send an AgentUpdate packet - mExternalActionFlags = outer_flags; - mbFlagsDirty = TRUE; - } -} - static U64 g_lastUpdateTime { 0 }; static F32 g_deltaTime { 0.0f }; static S32 g_lastUpdateFrame { 0 }; static S32 g_deltaFrame { 0 }; -void LLAgent::applyExternalActionFlags() +void LLAgent::applyExternalActionFlags(U32 outer_flags) { - if (! LLGameControl::isEnabled() || ! LLGameControl::willControlAvatar()) - { - return; - } + assert(LLGameControl::isEnabled() && LLGameControl::willControlAvatar()); + mExternalActionFlags = outer_flags; // HACK: AGENT_CONTROL_NUDGE_AT_NEG is used to toggle Flycam if ((mExternalActionFlags & AGENT_CONTROL_NUDGE_AT_NEG) > 0) |