From 805250d1e1ec21ec84d51be0271447f857f9559b Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 8 May 2015 09:25:44 -0700 Subject: [PATCH] don't double conditional to fire SN assert --- assignment-client/src/avatars/AvatarMixer.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/assignment-client/src/avatars/AvatarMixer.cpp b/assignment-client/src/avatars/AvatarMixer.cpp index ade1c5a444..0b510be151 100644 --- a/assignment-client/src/avatars/AvatarMixer.cpp +++ b/assignment-client/src/avatars/AvatarMixer.cpp @@ -258,13 +258,14 @@ void AvatarMixer::broadcastAvatarData() { PacketSequenceNumber lastSeqToReceiver = nodeData->getLastBroadcastSequenceNumber(otherNode->getUUID()); PacketSequenceNumber lastSeqFromSender = otherNode->getLastSequenceNumberForPacketType(PacketTypeAvatarData); - assert(lastSeqToReceiver <= lastSeqFromSender); - if (lastSeqToReceiver > lastSeqFromSender) { // Did we somehow get out of order packets from the sender? // We don't expect this to happen - in RELEASE we add this to a trackable stat - // and in DEBUG we crash on the assert above + // and in DEBUG we crash on the assert + otherNodeData->incrementNumOutOfOrderSends(); + + assert(false); } // make sure we haven't already sent this data from this sender to this receiver