History

remove exception when connecting to old server

Andrew Meadows committed 11 years ago

Commit c0ed3ed1 parent 51d05cc1 file · +2 −4Browse files

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

Unified · Split

interface/src/octree/OctreePacketProcessor.cpp+2−4
@@ -1,4 +1,4 @@
1//1/Merge branch 'master' of ssh://github.com/highfidelity/hifi into isentropic/
2// OctreePacketProcessor.cpp2// OctreePacketProcessor.cpp
3// interface/src/octree3// interface/src/octree
4//4//
@@ -59,9 +59,7 @@ void OctreePacketProcessor::processPacket(const SharedNodePointer& sendingNode, · 54 unmodified lines
59 PacketVersion expectedVersion = versionForPacketType(voxelPacketType);59 PacketVersion expectedVersion = versionForPacketType(voxelPacketType);
60 60
61 // check version of piggyback packet against expected version61 // check version of piggyback packet against expected version
62 if (packetVersion != expectedVersion62 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_AND_RADIANS)) {
65 static QMultiMap<QUuid, PacketType> versionDebugSuppressMap;63 static QMultiMap<QUuid, PacketType> versionDebugSuppressMap;
66 64
67 QUuid senderUUID = uuidFromPacketHeader(packet);65 QUuid senderUUID = uuidFromPacketHeader(packet);