From 52150ad97152bb28851cd60bd3c3cc5bfb4ebffb Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Tue, 13 Jun 2017 15:29:25 -0700
Subject: [PATCH] Add node data to downstream avatar mixers

---
 assignment-client/src/avatars/AvatarMixer.cpp   | 6 +++++-
 libraries/networking/src/ThreadedAssignment.cpp | 7 ++++---
 libraries/networking/src/ThreadedAssignment.h   | 5 ++++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/assignment-client/src/avatars/AvatarMixer.cpp b/assignment-client/src/avatars/AvatarMixer.cpp
index 4b032496b1..582c39b124 100644
--- a/assignment-client/src/avatars/AvatarMixer.cpp
+++ b/assignment-client/src/avatars/AvatarMixer.cpp
@@ -851,5 +851,9 @@ void AvatarMixer::parseDomainServerSettings(const QJsonObject& domainSettings) {
                      << "and a maximum avatar scale of" << _domainMaximumScale;
 
 
-    parseDownstreamServers(domainSettings, NodeType::AvatarMixer);
+    parseDownstreamServers(domainSettings, NodeType::AvatarMixer, [](Node& node) {
+        if (!node.getLinkedData()) {
+            node.setLinkedData(std::unique_ptr<NodeData> { new AvatarMixerClientData(node.getUUID()) });
+        }
+    });
 }
diff --git a/libraries/networking/src/ThreadedAssignment.cpp b/libraries/networking/src/ThreadedAssignment.cpp
index 5aeb076c11..24573e0ffc 100644
--- a/libraries/networking/src/ThreadedAssignment.cpp
+++ b/libraries/networking/src/ThreadedAssignment.cpp
@@ -134,7 +134,7 @@ void ThreadedAssignment::domainSettingsRequestFailed() {
     setFinished(true);
 }
 
-void ThreadedAssignment::parseDownstreamServers(const QJsonObject& settingsObject, NodeType_t nodeType) {
+void ThreadedAssignment::parseDownstreamServers(const QJsonObject& settingsObject, NodeType_t nodeType, DownstreamNodeFoundCallback callback) {
     static const QString REPLICATION_GROUP_KEY = "replication";
     static const QString DOWNSTREAM_SERVERS_SETTING_KEY = "downstream_servers";
     if (settingsObject.contains(REPLICATION_GROUP_KEY)) {
@@ -161,8 +161,9 @@ void ThreadedAssignment::parseDownstreamServers(const QJsonObject& settingsObjec
                 };
 
                 // manually add the downstream node to our node list
-                nodeList->addOrUpdateNode(QUuid::createUuid(), NodeType::downstreamType(nodeType),
-                                          downstreamServerAddr, downstreamServerAddr);
+                auto node = nodeList->addOrUpdateNode(QUuid::createUuid(), NodeType::downstreamType(nodeType),
+                                                      downstreamServerAddr, downstreamServerAddr);
+                callback(*node);
             }
         }
     }
diff --git a/libraries/networking/src/ThreadedAssignment.h b/libraries/networking/src/ThreadedAssignment.h
index f96755a776..0cc7b2f40c 100644
--- a/libraries/networking/src/ThreadedAssignment.h
+++ b/libraries/networking/src/ThreadedAssignment.h
@@ -18,6 +18,8 @@
 
 #include "Assignment.h"
 
+using DownstreamNodeFoundCallback = std::function<void(Node& downstreamNode)>;
+
 class ThreadedAssignment : public Assignment {
     Q_OBJECT
 public:
@@ -40,7 +42,8 @@ signals:
 
 protected:
     void commonInit(const QString& targetName, NodeType_t nodeType);
-    void parseDownstreamServers(const QJsonObject& settingsObject, NodeType_t nodeType);
+    void parseDownstreamServers(const QJsonObject& settingsObject, NodeType_t nodeType,
+                                DownstreamNodeFoundCallback callback = [](Node& downstreamNode) {});
 
     bool _isFinished;
     QTimer _domainServerTimer;