mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-08-09 15:58:35 +02:00
fix missed conflict on merge with upstream/master
This commit is contained in:
parent
8c6715e4fc
commit
7b903d29e7
1 changed files with 0 additions and 4 deletions
|
@ -194,12 +194,8 @@ void AssignmentClientMonitor::checkSpares() {
|
||||||
qDebug() << "asking child" << aSpareId << "to exit.";
|
qDebug() << "asking child" << aSpareId << "to exit.";
|
||||||
SharedNodePointer childNode = nodeList->nodeWithUUID(aSpareId);
|
SharedNodePointer childNode = nodeList->nodeWithUUID(aSpareId);
|
||||||
childNode->activateLocalSocket();
|
childNode->activateLocalSocket();
|
||||||
<<<<<<< HEAD
|
|
||||||
|
|
||||||
QByteArray diePacket = byteArrayWithPopulatedHeader(PacketTypeStopNode);
|
|
||||||
=======
|
|
||||||
QByteArray diePacket = nodeList->byteArrayWithPopulatedHeader(PacketTypeStopNode);
|
QByteArray diePacket = nodeList->byteArrayWithPopulatedHeader(PacketTypeStopNode);
|
||||||
>>>>>>> 5160eb5b94951200390de0de91962cc2aa9efccb
|
|
||||||
nodeList->writeUnverifiedDatagram(diePacket, childNode);
|
nodeList->writeUnverifiedDatagram(diePacket, childNode);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue