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

This commit is contained in:
Brad Hefta-Gaub 2016-01-06 11:26:05 -08:00
commit 0b43685f1e

View file

@ -41,7 +41,7 @@ PacketVersion versionForPacketType(PacketType packetType) {
case PacketType::EntityAdd: case PacketType::EntityAdd:
case PacketType::EntityEdit: case PacketType::EntityEdit:
case PacketType::EntityData: case PacketType::EntityData:
return VERSION_MODEL_ENTITIES_JOINTS_ON_WIRE; return VERSION_ENTITITES_HAVE_QUERY_BOX;
case PacketType::AvatarData: case PacketType::AvatarData:
case PacketType::BulkAvatarData: case PacketType::BulkAvatarData:
return static_cast<PacketVersion>(AvatarMixerPacketVersion::SoftAttachmentSupport); return static_cast<PacketVersion>(AvatarMixerPacketVersion::SoftAttachmentSupport);