From 628b9dfe0639a7dfccd05533671cbbf1d93d5ba0 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Mon, 27 Sep 2021 13:53:04 +0100
Subject: [PATCH] SL-15999 - removed kludgy run disablement, needs better fix
---
indra/newview/llviewermessage.cpp | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index c99232eba03..39c891c9c16 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
@@ -4136,13 +4127,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();
- }
}
--
GitLab