diff --git a/assignment-client/src/avatars/AvatarMixer.cpp b/assignment-client/src/avatars/AvatarMixer.cpp index 74641e9387..1e17467c3b 100644 --- a/assignment-client/src/avatars/AvatarMixer.cpp +++ b/assignment-client/src/avatars/AvatarMixer.cpp @@ -245,9 +245,8 @@ void AvatarMixer::broadcastAvatarData() { return; } - // if an avatar has just connected make sure we send out the mesh and billboard - bool forceSend = !nodeData->checkAndSetHasReceivedFirstPackets() - || !otherNodeData->checkAndSetHasReceivedFirstPacketsFrom(node->getUUID()); + // make sure we send out identity and billboard packets to and from new arrivals. + bool forceSend = !otherNodeData->checkAndSetHasReceivedFirstPacketsFrom(node->getUUID()); // we will also force a send of billboard or identity packet // if either has changed in the last frame diff --git a/assignment-client/src/avatars/AvatarMixerClientData.cpp b/assignment-client/src/avatars/AvatarMixerClientData.cpp index bfa7b99b68..9d78d92463 100644 --- a/assignment-client/src/avatars/AvatarMixerClientData.cpp +++ b/assignment-client/src/avatars/AvatarMixerClientData.cpp @@ -21,12 +21,6 @@ int AvatarMixerClientData::parseData(NLPacket& packet) { return _avatar.parseDataFromBuffer(packet.readWithoutCopy(packet.bytesLeftToRead())); } -bool AvatarMixerClientData::checkAndSetHasReceivedFirstPackets() { - bool oldValue = _hasReceivedFirstPackets; - _hasReceivedFirstPackets = true; - return oldValue; -} - bool AvatarMixerClientData::checkAndSetHasReceivedFirstPacketsFrom(const QUuid& uuid) { if (_hasReceivedFirstPacketsFrom.find(uuid) == _hasReceivedFirstPacketsFrom.end()) { _hasReceivedFirstPacketsFrom.insert(uuid); diff --git a/assignment-client/src/avatars/AvatarMixerClientData.h b/assignment-client/src/avatars/AvatarMixerClientData.h index 42a2c1d4e4..1f5e8fa77a 100644 --- a/assignment-client/src/avatars/AvatarMixerClientData.h +++ b/assignment-client/src/avatars/AvatarMixerClientData.h @@ -36,7 +36,6 @@ public: int parseData(NLPacket& packet); AvatarData& getAvatar() { return _avatar; } - bool checkAndSetHasReceivedFirstPackets(); bool checkAndSetHasReceivedFirstPacketsFrom(const QUuid& uuid); uint16_t getLastBroadcastSequenceNumber(const QUuid& nodeUUID) const; @@ -87,7 +86,6 @@ private: std::unordered_map _lastBroadcastSequenceNumbers; std::unordered_set _hasReceivedFirstPacketsFrom; - bool _hasReceivedFirstPackets = false; quint64 _billboardChangeTimestamp = 0; quint64 _identityChangeTimestamp = 0;