From 8e625e9a89d0e3b6982012249c1c34c6d76d148c Mon Sep 17 00:00:00 2001 From: Clement Date: Mon, 8 Oct 2018 17:33:18 -0700 Subject: [PATCH] Don't have the mixer treat non-avatar agent as avatars --- assignment-client/src/avatars/AvatarMixerSlave.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/assignment-client/src/avatars/AvatarMixerSlave.cpp b/assignment-client/src/avatars/AvatarMixerSlave.cpp index b6ec006c39..f3f47dff74 100644 --- a/assignment-client/src/avatars/AvatarMixerSlave.cpp +++ b/assignment-client/src/avatars/AvatarMixerSlave.cpp @@ -380,6 +380,11 @@ void AvatarMixerSlave::broadcastAvatarDataToAgent(const SharedNodePointer& node) if (lastSeqToReceiver == lastSeqFromSender && lastSeqToReceiver != 0) { ++numAvatarsHeldBack; shouldIgnore = true; + } else if (lastSeqFromSender == 0) { + // We have have not yet recieved any data about this avatar. Ignore it for now + // This is important for Agent scripts that are not avatar + // so that they don't appear to be an avatar at the origin + shouldIgnore = true; } else if (lastSeqFromSender - lastSeqToReceiver > 1) { // this is a skip - we still send the packet but capture the presence of the skip so we see it happening ++numAvatarsWithSkippedFrames;