History

Merge branch 'master' into fix/cmdline-discovery

Kalila committed 5 years ago

Commit 35948d72 parents 241c549 42ffb57179 files · +2542 −1229Browse files

Showing the changes to assignment-client/src/AssignmentClientMonitor.cpp (1 of 179 files). Show all

Unified · Split

assignment-client/src/AssignmentClientMonitor.cpp+1−1
@@ -337,7 +337,7 @@ void AssignmentClientMonitor::handleChildStatusPacket(QSharedPointer<ReceivedMes · 336 unmodified lines
337 auto nodeList = DependencyManager::get<NodeList>();337 auto nodeList = DependencyManager::get<NodeList>();
338 338
339 SharedNodePointer matchingNode = nodeList->nodeWithUUID(senderID);339 SharedNodePointer matchingNode = nodeList->nodeWithUUID(senderID);
340 const HifiSockAddr& senderSockAddr = message->getSenderSockAddr();340 const SockAddr& senderSockAddr = message->getSenderSockAddr();
341 341
342 AssignmentClientChildData* childData = nullptr;342 AssignmentClientChildData* childData = nullptr;
343 343