Merge pull request #15648 from Atlante45/fix/white-spheres

BUGZ-335: Clear traits ack data on node disconnect
This commit is contained in:
Shannon Romano 2019-05-29 17:27:16 -07:00 committed by GitHub
commit 5370a16c73
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -428,7 +428,7 @@ void AvatarMixerClientData::resetSentTraitData(Node::LocalID nodeLocalID) {
_lastSentTraitsTimestamps[nodeLocalID] = TraitsCheckTimestamp();
_perNodeSentTraitVersions[nodeLocalID].reset();
_perNodeAckedTraitVersions[nodeLocalID].reset();
for (auto && pendingTraitVersions : _perNodePendingTraitVersions) {
for (auto&& pendingTraitVersions : _perNodePendingTraitVersions) {
pendingTraitVersions.second[nodeLocalID].reset();
}
}
@ -488,4 +488,8 @@ void AvatarMixerClientData::cleanupKilledNode(const QUuid&, Node::LocalID nodeLo
removeLastBroadcastTime(nodeLocalID);
_lastSentTraitsTimestamps.erase(nodeLocalID);
_perNodeSentTraitVersions.erase(nodeLocalID);
_perNodeAckedTraitVersions.erase(nodeLocalID);
for (auto&& pendingTraitVersions : _perNodePendingTraitVersions) {
pendingTraitVersions.second.erase(nodeLocalID);
}
}