From 50f46dafa6fa2bdc463b97f5732588d78eb5b259 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 13 Jun 2017 15:38:15 -0700
Subject: [PATCH] add a sequence number to replicated avatar data

---
 .../src/avatars/AvatarMixerSlave.cpp              | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/assignment-client/src/avatars/AvatarMixerSlave.cpp b/assignment-client/src/avatars/AvatarMixerSlave.cpp
index a536eaabd3..8a3ec2dc5a 100644
--- a/assignment-client/src/avatars/AvatarMixerSlave.cpp
+++ b/assignment-client/src/avatars/AvatarMixerSlave.cpp
@@ -475,6 +475,9 @@ void AvatarMixerSlave::broadcastAvatarDataToDownstreamMixer(const SharedNodePoin
             maxAvatarByteArraySize -= NUM_BYTES_RFC4122_UUID;
             maxAvatarByteArraySize -= sizeof(quint16);
 
+            auto sequenceNumberSize = sizeof(agentNodeData->getLastReceivedSequenceNumber());
+            maxAvatarByteArraySize -= sequenceNumberSize;
+
             if (avatarByteArray.size() > maxAvatarByteArraySize) {
                 qCWarning(avatars) << "Replicated avatar data too large for" << otherAvatar->getSessionUUID()
                     << "-" << avatarByteArray.size() << "bytes";
@@ -492,11 +495,21 @@ void AvatarMixerSlave::broadcastAvatarDataToDownstreamMixer(const SharedNodePoin
             }
 
             if (avatarByteArray.size() <= maxAvatarByteArraySize) {
+                // increment the number of avatars sent to this reciever
+                nodeData->incrementNumAvatarsSentLastFrame();
+
+                // set the last sent sequence number for this sender on the receiver
+                nodeData->setLastBroadcastSequenceNumber(agentNode->getUUID(),
+                                                         agentNodeData->getLastReceivedSequenceNumber());
+
                 // start a new segment in the packet list for this avatar
                 avatarPacketList->startSegment();
 
+                // write the node's UUID, the size of the replicated avatar data,
+                // the sequence number of the replicated avatar data, and the replicated avatar data
                 numAvatarDataBytes += avatarPacketList->write(agentNode->getUUID().toRfc4122());
-                numAvatarDataBytes += avatarPacketList->writePrimitive((quint16) avatarByteArray.size());
+                numAvatarDataBytes += avatarPacketList->writePrimitive((quint16) (avatarByteArray.size() + sequenceNumberSize));
+                numAvatarDataBytes += avatarPacketList->writePrimitive(agentNodeData->getLastReceivedSequenceNumber());
                 numAvatarDataBytes += avatarPacketList->write(avatarByteArray);
 
                 avatarPacketList->endSegment();