From 78fdccccad4711a03d1c731b0004525e59c5f25b Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 11 Apr 2013 11:18:54 -0700 Subject: [PATCH] rename avatar mixer packet header, match in interface network receive --- avatar/src/main.cpp | 2 +- interface/src/main.cpp | 2 +- shared/src/PacketHeaders.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/avatar/src/main.cpp b/avatar/src/main.cpp index 2fa8523849..6bd50cf93a 100644 --- a/avatar/src/main.cpp +++ b/avatar/src/main.cpp @@ -83,7 +83,7 @@ int main(int argc, char* argv[]) ssize_t receivedBytes = 0; unsigned char *broadcastPacket = new unsigned char[MAX_PACKET_SIZE]; - *broadcastPacket = PACKET_HEADER_AVATAR_SERVER; + *broadcastPacket = PACKET_HEADER_BULK_AVATAR_DATA; unsigned char* currentBufferPosition = NULL; int agentIndex = 0; diff --git a/interface/src/main.cpp b/interface/src/main.cpp index 019c51010c..50dda5a84e 100644 --- a/interface/src/main.cpp +++ b/interface/src/main.cpp @@ -1211,7 +1211,7 @@ void *networkReceive(void *args) case PACKET_HEADER_ERASE_VOXEL: voxels.parseData(incomingPacket, bytesReceived); break; - case PACKET_HEADER_HEAD_DATA: + case PACKET_HEADER_BULK_AVATAR_DATA: agentList.processBulkAgentData(&senderAddress, incomingPacket, bytesReceived, sizeof(float) * 11); break; default: diff --git a/shared/src/PacketHeaders.h b/shared/src/PacketHeaders.h index 6439ecb0c4..ed2e5d5638 100644 --- a/shared/src/PacketHeaders.h +++ b/shared/src/PacketHeaders.h @@ -21,7 +21,7 @@ const char PACKET_HEADER_INJECT_AUDIO = 'I'; const char PACKET_HEADER_SET_VOXEL = 'S'; const char PACKET_HEADER_ERASE_VOXEL = 'E'; const char PACKET_HEADER_VOXEL_DATA = 'V'; -const char PACKET_HEADER_AVATAR_SERVER = 'X'; +const char PACKET_HEADER_BULK_AVATAR_DATA = 'X'; const char PACKET_HEADER_TRANSMITTER_DATA = 't'; #endif