From 77202af20d4db593caa6894de343d4a1dfe602a3 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 17 Apr 2014 18:05:22 -0700
Subject: [PATCH] add debug for erase from AvatarHashMap, repair check for
 display name

---
 assignment-client/src/Agent.cpp         | 2 +-
 interface/src/avatar/AvatarManager.cpp  | 1 -
 libraries/avatars/src/AvatarHashMap.cpp | 3 +++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/assignment-client/src/Agent.cpp b/assignment-client/src/Agent.cpp
index 6b8dbde79f..0d2103c748 100644
--- a/assignment-client/src/Agent.cpp
+++ b/assignment-client/src/Agent.cpp
@@ -132,7 +132,7 @@ void Agent::readPendingDatagrams() {
                 // let this continue through to the NodeList so it updates last heard timestamp
                 // for the sending audio mixer
                 NodeList::getInstance()->processNodeData(senderSockAddr, receivedPacket);
-            } else if (datagramPacketType == PacketTypeAvatarData
+            } else if (datagramPacketType == PacketTypeBulkAvatarData
                        || datagramPacketType == PacketTypeAvatarIdentity
                        || datagramPacketType == PacketTypeAvatarBillboard
                        || datagramPacketType == PacketTypeKillAvatar) {
diff --git a/interface/src/avatar/AvatarManager.cpp b/interface/src/avatar/AvatarManager.cpp
index f235d6f2e3..59f31388f8 100644
--- a/interface/src/avatar/AvatarManager.cpp
+++ b/interface/src/avatar/AvatarManager.cpp
@@ -135,7 +135,6 @@ AvatarSharedPointer AvatarManager::newSharedAvatar() {
 
 AvatarHash::iterator AvatarManager::erase(const AvatarHash::iterator& iterator) {
     if (iterator.key() != MY_AVATAR_KEY) {
-        qDebug() << "Removing Avatar with UUID" << iterator.key() << "from AvatarManager hash.";
         if (reinterpret_cast<Avatar*>(iterator.value().data())->isInitialized()) {
             _avatarFades.push_back(iterator.value());
         }
diff --git a/libraries/avatars/src/AvatarHashMap.cpp b/libraries/avatars/src/AvatarHashMap.cpp
index 01dba89b02..6b17a3fab8 100644
--- a/libraries/avatars/src/AvatarHashMap.cpp
+++ b/libraries/avatars/src/AvatarHashMap.cpp
@@ -25,6 +25,7 @@ void AvatarHashMap::insert(const QUuid& id, AvatarSharedPointer avatar) {
 }
 
 AvatarHash::iterator AvatarHashMap::erase(const AvatarHash::iterator& iterator) {
+    qDebug() << "Removing Avatar with UUID" << iterator.key() << "from AvatarHashMap.";
     return _avatarHash.erase(iterator);
 }
 
@@ -71,6 +72,8 @@ bool AvatarHashMap::containsAvatarWithDisplayName(const QString& displayName) {
             }
             
             break;
+        } else {
+            ++avatarIterator;
         }
     }