witch internal EntityItem data to use meters

Andrew Meadows committed 11 years ago

Commit b9cbd1e1 parent 90b69b17 files · +103 −97Browse files

Showing the changes to interface/src/octree/OctreePacketProcessor.cpp (1 of 7 files). Show all

Unified · Split

interface/src/octree/OctreePacketProcessor.cpp+3−1

@@ -59,7 +59,9 @@ void OctreePacketProcessor::processPacket(const SharedNodePointer& sendingNode, · 58 unmodified lines
59	PacketVersion expectedVersion = versionForPacketType(voxelPacketType);	59	PacketVersion expectedVersion = versionForPacketType(voxelPacketType);
60		60
61	// check version of piggyback packet against expected version	61	// check version of piggyback packet against expected version
62	if (packetVersion != expectedVersion) {	62	if (packetVersion != expectedVersion
		63	// TODO: remove the temporary exception below when everyone is using meters instead of DomainUnits
		64	&& !(PacketTypeEntityData == voxelPacketType && packetVersion < VERSION_ENTITIES_USE_METERS)) {
63	static QMultiMap<QUuid, PacketType> versionDebugSuppressMap;	65	static QMultiMap<QUuid, PacketType> versionDebugSuppressMap;
64		66
65	QUuid senderUUID = uuidFromPacketHeader(packet);	67	QUuid senderUUID = uuidFromPacketHeader(packet);