Merge branch 'master' of https://github.com/highfidelity/hifi into blue

Sam Gateau committed 11 years ago

Commit 72c32702 parents f1fcce3 5160eb554 files · +1020 −405Browse files

Showing the changes to interface/src/Application.cpp (1 of 54 files). Show all

Unified · Split

interface/src/Application.cpp+2−2

@@ -2577,7 +2577,7 @@ int Application::sendNackPackets() { · 2576 unmodified lines
2577	2577	int bytesRemaining = MAX_PACKET_SIZE;
2578	2578
2579	2579	// pack header
2580		− int numBytesPacketHeader = populatePacketHeader(packet, PacketTypeOctreeDataNack);
	2580	+ int numBytesPacketHeader = nodeList->populatePacketHeader(packet, PacketTypeOctreeDataNack);
2581	2581	dataAt += numBytesPacketHeader;
2582	2582	bytesRemaining -= numBytesPacketHeader;
2583	2583
@@ -2778,7 +2778,7 @@ void Application::queryOctree(NodeType_t serverType, PacketType packetType, Node · 194 unmodified lines
2778	2778	unsigned char* endOfQueryPacket = queryPacket;
2779	2779
2780	2780	// insert packet type/version and node UUID
2781		− endOfQueryPacket += populatePacketHeader(reinterpret_cast<char*>(endOfQueryPacket), packetType);
	2781	+ endOfQueryPacket += nodeList->populatePacketHeader(reinterpret_cast<char*>(endOfQueryPacket), packetType);
2782	2782
2783	2783	// encode the query data...
2784	2784	endOfQueryPacket += _octreeQuery.getBroadcastData(endOfQueryPacket);