From f8ab33ccc7e6bc3c45b89f77b1d2fc5318365936 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 16 Apr 2013 12:48:47 -0700 Subject: [PATCH] add missing packet header for broadcast head data --- interface/src/main.cpp | 6 ++++-- libraries/shared/src/AgentList.cpp | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/interface/src/main.cpp b/interface/src/main.cpp index b2f92b06fd..a5a354eca5 100644 --- a/interface/src/main.cpp +++ b/interface/src/main.cpp @@ -455,7 +455,9 @@ void updateAvatar(float frametime) // Send my stream of head/hand data to the avatar mixer and voxel server unsigned char broadcastString[200]; - int broadcastBytes = myAvatar.getBroadcastData(broadcastString); + *broadcastString = PACKET_HEADER_HEAD_DATA; + + int broadcastBytes = myAvatar.getBroadcastData(broadcastString + 1); const char broadcastReceivers[2] = {AGENT_TYPE_VOXEL, AGENT_TYPE_AVATAR_MIXER}; AgentList::getInstance()->broadcastToAgents(broadcastString, broadcastBytes, broadcastReceivers, 2); @@ -1097,7 +1099,7 @@ void sendVoxelServerEraseAll() { sprintf(message,"%c%s",'Z',"erase all"); int messageSize = strlen(message) + 1; AgentList::getInstance()->broadcastToAgents((unsigned char*) message, messageSize, &AGENT_TYPE_VOXEL, 1); -} +}\ void sendVoxelServerAddScene() { char message[100]; diff --git a/libraries/shared/src/AgentList.cpp b/libraries/shared/src/AgentList.cpp index 6d56aac726..2751527d37 100644 --- a/libraries/shared/src/AgentList.cpp +++ b/libraries/shared/src/AgentList.cpp @@ -118,7 +118,7 @@ void AgentList::processBulkAgentData(sockaddr *senderAddress, unsigned char *pac while ((currentPosition - startPosition) < numTotalBytes) { currentPosition += unpackAgentId(currentPosition, &agentID); memcpy(packetHolder + 1, currentPosition, numBytesPerAgent); - + int matchingAgentIndex = indexOfMatchingAgent(agentID); if (matchingAgentIndex >= 0) {