From 747cca9beb8f9faddb87244775f9f1867c4b0f73 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 14 Jun 2017 17:17:32 -0700
Subject: [PATCH] don't manage display name or send empty to downstream

---
 assignment-client/src/avatars/AvatarMixer.cpp |  4 ++-
 .../src/avatars/AvatarMixerSlave.cpp          | 27 ++++++++++---------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/assignment-client/src/avatars/AvatarMixer.cpp b/assignment-client/src/avatars/AvatarMixer.cpp
index e9885621db..631145aee4 100644
--- a/assignment-client/src/avatars/AvatarMixer.cpp
+++ b/assignment-client/src/avatars/AvatarMixer.cpp
@@ -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) {
-                    manageDisplayName(node);
+                    if (node->getType() == NodeType::Agent && !node->isUpstream()) {
+                        manageDisplayName(node);
+                    }
                     ++_sumListeners;
                 });
             }, &lockWait, &nodeTransform, &functor);
diff --git a/assignment-client/src/avatars/AvatarMixerSlave.cpp b/assignment-client/src/avatars/AvatarMixerSlave.cpp
index 95a3a5034d..17d222e9e3 100644
--- a/assignment-client/src/avatars/AvatarMixerSlave.cpp
+++ b/assignment-client/src/avatars/AvatarMixerSlave.cpp
@@ -441,7 +441,6 @@ void AvatarMixerSlave::broadcastAvatarDataToDownstreamMixer(const SharedNodePoin
 
     AvatarMixerClientData* nodeData = reinterpret_cast<AvatarMixerClientData*>(node->getLinkedData());
     if (!nodeData) {
-        qDebug() << "No node data";
         return;
     }
 
@@ -544,22 +543,24 @@ void AvatarMixerSlave::broadcastAvatarDataToDownstreamMixer(const SharedNodePoin
         }
     });
 
-    quint64 startPacketSending = usecTimestampNow();
+    if (avatarPacketList->getNumPackets() > 0) {
+        quint64 startPacketSending = usecTimestampNow();
 
-    // close the current packet so that we're always sending something
-    avatarPacketList->closeCurrentPacket(true);
+        // close the current packet so that we're always sending something
+        avatarPacketList->closeCurrentPacket(true);
 
-    _stats.numPacketsSent += (int)avatarPacketList->getNumPackets();
-    _stats.numBytesSent += numAvatarDataBytes;
+        _stats.numPacketsSent += (int)avatarPacketList->getNumPackets();
+        _stats.numBytesSent += numAvatarDataBytes;
 
-    // send the replicated bulk avatar data
-    auto nodeList = DependencyManager::get<NodeList>();
-    nodeList->sendPacketList(std::move(avatarPacketList), node->getPublicSocket());
+        // send the replicated bulk avatar data
+        auto nodeList = DependencyManager::get<NodeList>();
+        nodeList->sendPacketList(std::move(avatarPacketList), node->getPublicSocket());
 
-    // record the bytes sent for other avatar data in the AvatarMixerClientData
-    nodeData->recordSentAvatarData(numAvatarDataBytes);
+        // record the bytes sent for other avatar data in the AvatarMixerClientData
+        nodeData->recordSentAvatarData(numAvatarDataBytes);
 
-    quint64 endPacketSending = usecTimestampNow();
-    _stats.packetSendingElapsedTime += (endPacketSending - startPacketSending);
+        quint64 endPacketSending = usecTimestampNow();
+        _stats.packetSendingElapsedTime += (endPacketSending - startPacketSending);
+    }
 }