diff options
| author | Callum Linden <callum@lindenlab.com> | 2021-09-28 15:25:12 -0700 |
|---|---|---|
| committer | Callum Linden <callum@lindenlab.com> | 2021-09-28 15:25:12 -0700 |
| commit | 89057746316affe2fef7314624942fa43085d6b6 (patch) | |
| tree | 6187d3d751c13f46b571b10908e5d56f3febff94 /indra/newview/llviewermessage.cpp | |
| parent | 851fef680164e3472b0516e7237bbcc4a35bc5a3 (diff) | |
| parent | 187d5862398820e28a8935ce9058f444f4963153 (diff) | |
Merge branch 'SL-15999' of https://bitbucket.org/lindenlab/viewer into SL-15999
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index c99232eba0..ab65d747ba 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -4049,7 +4049,6 @@ void process_avatar_animation(LLMessageSystem *mesgsys, void **user_data) S32 num_blocks = mesgsys->getNumberOfBlocksFast(_PREHASH_AnimationList); S32 num_source_blocks = mesgsys->getNumberOfBlocksFast(_PREHASH_AnimationSourceList); - bool non_interactive_got_run = false; LL_DEBUGS("Messaging", "Motion") << "Processing " << num_blocks << " Animations" << LL_ENDL; @@ -4065,14 +4064,6 @@ void process_avatar_animation(LLMessageSystem *mesgsys, void **user_data) mesgsys->getUUIDFast(_PREHASH_AnimationList, _PREHASH_AnimID, animation_id, i); mesgsys->getS32Fast(_PREHASH_AnimationList, _PREHASH_AnimSequenceID, anim_sequence_id, i); - if (gNonInteractive && (animation_id == ANIM_AGENT_RUN)) - { - // RUN requests get sent at startup for unclear - // reasons. Same avatar may get requests one run and - // not another. At least in the non-interactive case, - // we want to override these. - non_interactive_got_run = true; - } avatarp->mSignaledAnimations[animation_id] = anim_sequence_id; // *HACK: Disabling flying mode if it has been enabled shortly before the agent @@ -4086,6 +4077,11 @@ void process_avatar_animation(LLMessageSystem *mesgsys, void **user_data) gAgent.setFlying(FALSE); } + if (gNonInteractive && animation_id == ANIM_AGENT_RUN) + { + LL_INFOS() << "Noninteractive, got run request for self" << LL_ENDL; + } + if (i < num_source_blocks) { mesgsys->getUUIDFast(_PREHASH_AnimationSourceList, _PREHASH_ObjectID, object_id, i); @@ -4136,13 +4132,6 @@ void process_avatar_animation(LLMessageSystem *mesgsys, void **user_data) { avatarp->processAnimationStateChanges(); } - - if (non_interactive_got_run) - { - // Total kluge alert. - LL_INFOS("Messaging","Motion") << "non-interactive mode, resetting animations" << LL_ENDL; - gAgent.stopCurrentAnimations(); - } } |