From e3db60d1efa4f2dd750668aad6fcfca04158ca37 Mon Sep 17 00:00:00 2001 From: wangyix Date: Mon, 16 Jun 2014 16:42:04 -0700 Subject: [PATCH] forgot to add "break;"s --- interface/src/DatagramProcessor.cpp | 3 +++ libraries/octree/src/OctreeEditPacketSender.cpp | 2 +- libraries/octree/src/OctreeEditPacketSender.h | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/interface/src/DatagramProcessor.cpp b/interface/src/DatagramProcessor.cpp index e032056fc8..29528da126 100644 --- a/interface/src/DatagramProcessor.cpp +++ b/interface/src/DatagramProcessor.cpp @@ -147,10 +147,13 @@ void DatagramProcessor::processDatagrams() { } case PacketTypeVoxelEditNack: application->_voxelEditSender.processNackPacket(incomingPacket); + break; case PacketTypeParticleEditNack: application->_particleEditSender.processNackPacket(incomingPacket); + break; case PacketTypeModelEditNack: application->_modelEditSender.processNackPacket(incomingPacket); + break; default: nodeList->processNodeData(senderSockAddr, incomingPacket); break; diff --git a/libraries/octree/src/OctreeEditPacketSender.cpp b/libraries/octree/src/OctreeEditPacketSender.cpp index 439148a9a5..16bb22987d 100644 --- a/libraries/octree/src/OctreeEditPacketSender.cpp +++ b/libraries/octree/src/OctreeEditPacketSender.cpp @@ -343,7 +343,7 @@ bool OctreeEditPacketSender::process() { return PacketSender::process(); } -void OctreeEditPacketSender::parseNackPacket(const QByteArray& packet) { +void OctreeEditPacketSender::processNackPacket(const QByteArray& packet) { // parse sending node from packet, retrieve packet history for that node QUuid sendingNodeUUID = uuidFromPacketHeader(packet); diff --git a/libraries/octree/src/OctreeEditPacketSender.h b/libraries/octree/src/OctreeEditPacketSender.h index 45913b8db2..419e850ff8 100644 --- a/libraries/octree/src/OctreeEditPacketSender.h +++ b/libraries/octree/src/OctreeEditPacketSender.h @@ -93,7 +93,7 @@ public: virtual void adjustEditPacketForClockSkew(unsigned char* codeColorBuffer, ssize_t length, int clockSkew) { }; public: - void parseNackPacket(const QByteArray& packet); + void processNackPacket(const QByteArray& packet); protected: bool _shouldSend;