From 768a854b00033c3ed4e896bc473fd2e854603462 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Thu, 6 Nov 2014 14:00:26 -0800 Subject: [PATCH] cleanup --- assignment-client/src/octree/OctreeInboundPacketProcessor.cpp | 1 - libraries/entities/src/EntityTree.cpp | 2 -- libraries/entities/src/EntityTreeElement.cpp | 2 -- libraries/octree/src/Octree.cpp | 1 - 4 files changed, 6 deletions(-) diff --git a/assignment-client/src/octree/OctreeInboundPacketProcessor.cpp b/assignment-client/src/octree/OctreeInboundPacketProcessor.cpp index e98e964691..b9bde8d544 100644 --- a/assignment-client/src/octree/OctreeInboundPacketProcessor.cpp +++ b/assignment-client/src/octree/OctreeInboundPacketProcessor.cpp @@ -154,7 +154,6 @@ void OctreeInboundPacketProcessor::processPacket(const SharedNodePointer& sendin quint64 startLock = usecTimestampNow(); _myServer->getOctree()->lockForWrite(); - quint64 startProcess = usecTimestampNow(); int editDataBytesRead = _myServer->getOctree()->processEditPacketData(packetType, reinterpret_cast(packet.data()), diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp index af0aee7858..f31f21ebe9 100644 --- a/libraries/entities/src/EntityTree.cpp +++ b/libraries/entities/src/EntityTree.cpp @@ -496,10 +496,8 @@ int EntityTree::processEditPacketData(PacketType packetType, const unsigned char // if the entityItem exists, then update it if (existingEntity) { - qDebug() << "Calling updateEntity() properties.getLastEdited(): " << properties.getLastEdited(); updateEntity(entityItemID, properties); existingEntity->markAsChangedOnServer(); - qDebug() << "AFTER updateEntity() now: " << usecTimestampNow(); } else { qDebug() << "User attempted to edit an unknown entity. ID:" << entityItemID; } diff --git a/libraries/entities/src/EntityTreeElement.cpp b/libraries/entities/src/EntityTreeElement.cpp index ceefc88ba7..079fb1bba7 100644 --- a/libraries/entities/src/EntityTreeElement.cpp +++ b/libraries/entities/src/EntityTreeElement.cpp @@ -325,9 +325,7 @@ OctreeElement::AppendState EntityTreeElement::appendElementData(OctreePacketData if (successAppendEntityCount) { foreach (uint16_t i, indexesOfEntitiesToInclude) { EntityItem* entity = (*_entityItems)[i]; - LevelDetails entityLevel = packetData->startLevel(); - OctreeElement::AppendState appendEntityState = entity->appendEntityData(packetData, params, entityTreeElementExtraEncodeData); diff --git a/libraries/octree/src/Octree.cpp b/libraries/octree/src/Octree.cpp index 24c7499f9d..ceda91a441 100644 --- a/libraries/octree/src/Octree.cpp +++ b/libraries/octree/src/Octree.cpp @@ -19,7 +19,6 @@ #include // to load voxels from file #include -#include #include #include