mirror of
https://github.com/overte-org/overte.git
synced 2025-04-27 18:55:55 +02:00
removing more noise
This commit is contained in:
parent
6396838afc
commit
ba9cd6fdd4
2 changed files with 0 additions and 12 deletions
|
@ -118,19 +118,13 @@ void VoxelNodeData::writeToPacket(unsigned char* buffer, int bytes) {
|
||||||
}
|
}
|
||||||
|
|
||||||
VoxelNodeData::~VoxelNodeData() {
|
VoxelNodeData::~VoxelNodeData() {
|
||||||
|
|
||||||
qDebug("VoxelNodeData::~VoxelNodeData() this=%p owningNode=%p _voxelSendThread=%p\n",
|
|
||||||
this, getOwningNode(), _voxelSendThread);
|
|
||||||
QUuid nodeUUID = getOwningNode()->getUUID();
|
QUuid nodeUUID = getOwningNode()->getUUID();
|
||||||
qDebug() << "VoxelNodeData::~VoxelNodeData() nodeUUID=" << nodeUUID << "\n";
|
|
||||||
|
|
||||||
delete[] _voxelPacket;
|
delete[] _voxelPacket;
|
||||||
delete[] _lastVoxelPacket;
|
delete[] _lastVoxelPacket;
|
||||||
|
|
||||||
if (_voxelSendThread) {
|
if (_voxelSendThread) {
|
||||||
_voxelSendThread->terminate();
|
_voxelSendThread->terminate();
|
||||||
delete _voxelSendThread;
|
delete _voxelSendThread;
|
||||||
qDebug("VoxelNodeData::~VoxelNodeData() DELETED _voxelSendThread=%p\n", _voxelSendThread);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -733,35 +733,29 @@ void VoxelServer::run() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
qDebug() << "VoxelServer::run()... AFTER loop...\n";
|
|
||||||
|
|
||||||
// call NodeList::clear() so that all of our node specific objects, including our sending threads, are
|
// call NodeList::clear() so that all of our node specific objects, including our sending threads, are
|
||||||
// properly shutdown and cleaned up.
|
// properly shutdown and cleaned up.
|
||||||
NodeList::getInstance()->clear();
|
NodeList::getInstance()->clear();
|
||||||
|
|
||||||
qDebug() << "VoxelServer::run()... terminating _jurisdictionSender\n";
|
|
||||||
if (_jurisdictionSender) {
|
if (_jurisdictionSender) {
|
||||||
_jurisdictionSender->terminate();
|
_jurisdictionSender->terminate();
|
||||||
delete _jurisdictionSender;
|
delete _jurisdictionSender;
|
||||||
}
|
}
|
||||||
|
|
||||||
qDebug() << "VoxelServer::run()... terminating _voxelServerPacketProcessor\n";
|
|
||||||
if (_voxelServerPacketProcessor) {
|
if (_voxelServerPacketProcessor) {
|
||||||
_voxelServerPacketProcessor->terminate();
|
_voxelServerPacketProcessor->terminate();
|
||||||
delete _voxelServerPacketProcessor;
|
delete _voxelServerPacketProcessor;
|
||||||
}
|
}
|
||||||
|
|
||||||
qDebug() << "VoxelServer::run()... terminating _voxelPersistThread\n";
|
|
||||||
if (_voxelPersistThread) {
|
if (_voxelPersistThread) {
|
||||||
_voxelPersistThread->terminate();
|
_voxelPersistThread->terminate();
|
||||||
delete _voxelPersistThread;
|
delete _voxelPersistThread;
|
||||||
}
|
}
|
||||||
|
|
||||||
// tell our NodeList we're done with notifications
|
// tell our NodeList we're done with notifications
|
||||||
qDebug() << "VoxelServer::run()... nodeList->removeHook(&_nodeWatcher)\n";
|
|
||||||
nodeList->removeHook(&_nodeWatcher);
|
nodeList->removeHook(&_nodeWatcher);
|
||||||
|
|
||||||
qDebug() << "VoxelServer::run()... deleting _jurisdiction\n";
|
|
||||||
delete _jurisdiction;
|
delete _jurisdiction;
|
||||||
_jurisdiction = NULL;
|
_jurisdiction = NULL;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue