From 56886e479d6ef479297fe5139aa2c46aecb33a05 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Thu, 16 Jul 2015 15:28:53 -0700 Subject: [PATCH] Use BulkAvatarData packet type for AvatarMixer upstrea --- assignment-client/src/avatars/AvatarMixer.cpp | 2 +- libraries/avatars/src/AvatarHashMap.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assignment-client/src/avatars/AvatarMixer.cpp b/assignment-client/src/avatars/AvatarMixer.cpp index ebfb0709d7..9b0af75b07 100644 --- a/assignment-client/src/avatars/AvatarMixer.cpp +++ b/assignment-client/src/avatars/AvatarMixer.cpp @@ -219,7 +219,7 @@ void AvatarMixer::broadcastAvatarData() { } // setup a PacketList for the avatarPackets - NLPacketList avatarPacketList(PacketType::AvatarData); + NLPacketList avatarPacketList(PacketType::BulkAvatarData); // this is an AGENT we have received head data from // send back a packet with other active node data to this node diff --git a/libraries/avatars/src/AvatarHashMap.cpp b/libraries/avatars/src/AvatarHashMap.cpp index 0dbc1a5e46..3243ff3f9a 100644 --- a/libraries/avatars/src/AvatarHashMap.cpp +++ b/libraries/avatars/src/AvatarHashMap.cpp @@ -22,7 +22,7 @@ AvatarHashMap::AvatarHashMap() { connect(DependencyManager::get().data(), &NodeList::uuidChanged, this, &AvatarHashMap::sessionUUIDChanged); auto& packetReceiver = DependencyManager::get()->getPacketReceiver(); - packetReceiver.registerListener(PacketType::AvatarData, this, "processAvatarDataPacket"); + packetReceiver.registerListener(PacketType::BulkAvatarData, this, "processAvatarDataPacket"); packetReceiver.registerListener(PacketType::KillAvatar, this, "processKillAvatar"); packetReceiver.registerListener(PacketType::AvatarIdentity, this, "processAvatarIdentityPacket"); packetReceiver.registerListener(PacketType::AvatarBillboard, this, "processAvatarBillboardPacket");