From 202d446f076bb7f8921446e702af5d71296fe85a Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 8 Jul 2013 14:59:00 -0700 Subject: [PATCH] use packet version helpers for PACKET_TYPE_AVATAR_VOXEL_URL --- interface/src/Application.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 42a58abab7..fe9ae8b3fc 100755 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -993,7 +993,11 @@ void Application::sendAvatarVoxelURLMessage(const QUrl& url) { return; // we don't yet know who we are } QByteArray message; - message.append(PACKET_TYPE_AVATAR_VOXEL_URL); + + char packetHeader[MAX_PACKET_HEADER_BYTES]; + int numBytesPacketHeader = populateTypeAndVersion((unsigned char*) packetHeader, PACKET_TYPE_AVATAR_VOXEL_URL); + + message.append(packetHeader, numBytesPacketHeader); message.append((const char*)&ownerID, sizeof(ownerID)); message.append(url.toEncoded()); @@ -1002,8 +1006,9 @@ void Application::sendAvatarVoxelURLMessage(const QUrl& url) { void Application::processAvatarVoxelURLMessage(unsigned char *packetData, size_t dataBytes) { // skip the header - packetData++; - dataBytes--; + int numBytesPacketHeader = numBytesForPacketHeader(packetData); + packetData += numBytesPacketHeader; + dataBytes -= numBytesPacketHeader; // read the node id uint16_t nodeID = *(uint16_t*)packetData;