From bc269314829f5b3e795c4531deac12a3b45195c1 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 5 Aug 2022 19:44:09 +0300
Subject: [PATCH] SL-17908 No left and right events when both held down
Reverts part of SL-15746
---
indra/newview/llagent.cpp | 3 +++
indra/newview/llviewermessage.cpp | 7 -------
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 7f6f6e59974..999f4a9f205 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -716,6 +716,9 @@ void LLAgent::moveYaw(F32 mag, bool reset_view)
U32 mask = AGENT_CONTROL_YAW_POS | AGENT_CONTROL_YAW_NEG;
if ((getControlFlags() & mask) == mask)
{
+ // Rotation into both directions should cancel out
+ // But keep sending controls to simulator,
+ // it's needed for script based controls
gAgentCamera.setYawKey(0);
}
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index be80d0bc0a4..5f82f1c44ff 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -3334,13 +3334,6 @@ void send_agent_update(BOOL force_send, BOOL send_reliable)
// trigger a control event.
U32 control_flags = gAgent.getControlFlags();
- // Rotation into both directions should cancel out
- U32 mask = AGENT_CONTROL_YAW_POS | AGENT_CONTROL_YAW_NEG;
- if ((control_flags & mask) == mask)
- {
- control_flags &= ~mask;
- }
-
MASK key_mask = gKeyboard->currentMask(TRUE);
if (key_mask & MASK_ALT || key_mask & MASK_CONTROL)
--
GitLab