From 9aebf68664ca4d1598e2c0df815f4bb3357497a2 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Mon, 12 Jun 2017 16:32:54 -0700 Subject: [PATCH] Parse replicant from domain settings --- assignment-client/src/avatars/AvatarMixer.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/assignment-client/src/avatars/AvatarMixer.cpp b/assignment-client/src/avatars/AvatarMixer.cpp index 75b3d23563..aae447be60 100644 --- a/assignment-client/src/avatars/AvatarMixer.cpp +++ b/assignment-client/src/avatars/AvatarMixer.cpp @@ -69,7 +69,8 @@ void AvatarMixer::handleReplicatedPackets(QSharedPointer messag auto nodeID = QUuid::fromRfc4122(message->readWithoutCopy(NUM_BYTES_RFC4122_UUID)); auto replicatedNode = nodeList->addOrUpdateNode(nodeID, NodeType::Agent, - message->getSenderSockAddr(), message->getSenderSockAddr()) + message->getSenderSockAddr(), message->getSenderSockAddr(), + DEFAULT_AGENT_PERMISSIONS, true); replicatedNode->setLastHeardMicrostamp(usecTimestampNow()); replicatedNode->setIsUpstream(true); @@ -115,7 +116,7 @@ void AvatarMixer::optionallyReplicatePacket(ReceivedMessage& message, const Node auto nodeList = DependencyManager::get(); nodeList->eachMatchingNode([&](const SharedNodePointer& node) { - return node->getType() == NodeType::ReplicantAvatarMixer; + return node->getType() == NodeType::DownstreamAvatarMixer; }, [&](const SharedNodePointer& node) { if (!packet) { // construct an NLPacket to send to the replicant that has the contents of the received packet @@ -848,4 +849,6 @@ void AvatarMixer::parseDomainServerSettings(const QJsonObject& domainSettings) { qCDebug(avatars) << "This domain requires a minimum avatar scale of" << _domainMinimumScale << "and a maximum avatar scale of" << _domainMaximumScale; + + parseDownstreamServers(domainSettings, NodeType::AvatarMixer); }