mirror of
https://github.com/overte-org/overte.git
synced 2025-08-08 00:30:52 +02:00
don't manage display name or send empty to downstream
This commit is contained in:
parent
224a559602
commit
747cca9beb
2 changed files with 17 additions and 14 deletions
|
@ -225,7 +225,9 @@ void AvatarMixer::start() {
|
|||
auto start = usecTimestampNow();
|
||||
nodeList->nestedEach([&](NodeList::const_iterator cbegin, NodeList::const_iterator cend) {
|
||||
std::for_each(cbegin, cend, [&](const SharedNodePointer& node) {
|
||||
if (node->getType() == NodeType::Agent && !node->isUpstream()) {
|
||||
manageDisplayName(node);
|
||||
}
|
||||
++_sumListeners;
|
||||
});
|
||||
}, &lockWait, &nodeTransform, &functor);
|
||||
|
|
|
@ -441,7 +441,6 @@ void AvatarMixerSlave::broadcastAvatarDataToDownstreamMixer(const SharedNodePoin
|
|||
|
||||
AvatarMixerClientData* nodeData = reinterpret_cast<AvatarMixerClientData*>(node->getLinkedData());
|
||||
if (!nodeData) {
|
||||
qDebug() << "No node data";
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -544,6 +543,7 @@ void AvatarMixerSlave::broadcastAvatarDataToDownstreamMixer(const SharedNodePoin
|
|||
}
|
||||
});
|
||||
|
||||
if (avatarPacketList->getNumPackets() > 0) {
|
||||
quint64 startPacketSending = usecTimestampNow();
|
||||
|
||||
// close the current packet so that we're always sending something
|
||||
|
@ -561,5 +561,6 @@ void AvatarMixerSlave::broadcastAvatarDataToDownstreamMixer(const SharedNodePoin
|
|||
|
||||
quint64 endPacketSending = usecTimestampNow();
|
||||
_stats.packetSendingElapsedTime += (endPacketSending - startPacketSending);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue