From 040c7557dac4661ac9a7cd9976c5b7881ea0ac44 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 16 Jul 2015 17:51:06 -0700
Subject: [PATCH] fix double register for Agent avatar packets

---
 assignment-client/src/Agent.cpp       | 5 -----
 libraries/avatars/src/AvatarHashMap.h | 7 ++++---
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/assignment-client/src/Agent.cpp b/assignment-client/src/Agent.cpp
index bb785c38cf..c4b3316843 100644
--- a/assignment-client/src/Agent.cpp
+++ b/assignment-client/src/Agent.cpp
@@ -58,11 +58,6 @@ Agent::Agent(NLPacket& packet) :
         { PacketType::OctreeStats, PacketType::EntityData, PacketType::EntityErase },
         this, "handleOctreePacket");
     packetReceiver.registerListener(PacketType::Jurisdiction, this, "handleJurisdictionPacket");
-    
-    packetReceiver.registerListener(PacketType::BulkAvatarData, this, "processAvatarDataPacket");
-    packetReceiver.registerListener(PacketType::KillAvatar, this, "processKillAvatar");
-    packetReceiver.registerListener(PacketType::AvatarIdentity, this, "processAvatarIdentityPacket");
-    packetReceiver.registerListener(PacketType::AvatarBillboard, this, "processAvatarBillboardPacket");
 }
 
 void Agent::handleOctreePacket(QSharedPointer<NLPacket> packet, SharedNodePointer senderNode) {
diff --git a/libraries/avatars/src/AvatarHashMap.h b/libraries/avatars/src/AvatarHashMap.h
index fa61788816..c0e068001a 100644
--- a/libraries/avatars/src/AvatarHashMap.h
+++ b/libraries/avatars/src/AvatarHashMap.h
@@ -36,14 +36,15 @@ public:
 
 public slots:
     bool isAvatarInRange(const glm::vec3 & position, const float range);
-
-private slots:
-    void sessionUUIDChanged(const QUuid& sessionUUID, const QUuid& oldUUID);
+    
     void processAvatarDataPacket(QSharedPointer<NLPacket> packet, SharedNodePointer sendingNode);
     void processAvatarIdentityPacket(QSharedPointer<NLPacket> packet, SharedNodePointer sendingNode);
     void processAvatarBillboardPacket(QSharedPointer<NLPacket> packet, SharedNodePointer sendingNode);
     void processKillAvatar(QSharedPointer<NLPacket> packet, SharedNodePointer sendingNode);
 
+private slots:
+    void sessionUUIDChanged(const QUuid& sessionUUID, const QUuid& oldUUID);
+
 protected:
     AvatarHashMap();