From c0ed3edbbbb8d2f76a0e844dfa7a05a4e767be01 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Mon, 9 Mar 2015 09:38:26 -0700
Subject: [PATCH] remove exception when connecting to old server

---
 interface/src/octree/OctreePacketProcessor.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/interface/src/octree/OctreePacketProcessor.cpp b/interface/src/octree/OctreePacketProcessor.cpp
index 92eb7f7f31..e735239331 100644
--- a/interface/src/octree/OctreePacketProcessor.cpp
+++ b/interface/src/octree/OctreePacketProcessor.cpp
@@ -1,4 +1,4 @@
-//
+/Merge branch 'master' of ssh://github.com/highfidelity/hifi into isentropic/
 //  OctreePacketProcessor.cpp
 //  interface/src/octree
 //
@@ -59,9 +59,7 @@ void OctreePacketProcessor::processPacket(const SharedNodePointer& sendingNode,
     PacketVersion expectedVersion = versionForPacketType(voxelPacketType);
     
     // check version of piggyback packet against expected version
-    if (packetVersion != expectedVersion
-            // TODO: remove the temporary exception below when everyone is using meters instead of DomainUnits
-            && !(PacketTypeEntityData == voxelPacketType && packetVersion < VERSION_ENTITIES_USE_METERS_AND_RADIANS)) {
+    if (packetVersion != expectedVersion) {
         static QMultiMap<QUuid, PacketType> versionDebugSuppressMap;
         
         QUuid senderUUID = uuidFromPacketHeader(packet);