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

This commit is contained in:
Atlante45 2014-03-18 17:37:07 -07:00
commit 93f66b074a

View file

@ -91,6 +91,8 @@ bool NodeList::packetVersionAndHashMatch(const QByteArray& packet) {
qDebug() << "Packet version mismatch on" << packetTypeForPacket(packet) << "- Sender"
<< uuidFromPacketHeader(packet) << "sent" << qPrintable(QString::number(packet[numPacketTypeBytes])) << "but"
<< qPrintable(QString::number(versionForPacketType(mismatchType))) << "expected.";
return false;
}
const QSet<PacketType> NON_VERIFIED_PACKETS = QSet<PacketType>()