From e75d14139f0062dae884b92ce9845a7b4cea3e7c Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 17 Apr 2014 17:21:38 -0700
Subject: [PATCH] fix avatar kill behaviour

---
 interface/src/avatar/AvatarManager.cpp  | 4 ++++
 interface/src/avatar/AvatarManager.h    | 2 ++
 libraries/avatars/src/AvatarHashMap.cpp | 5 ++---
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/interface/src/avatar/AvatarManager.cpp b/interface/src/avatar/AvatarManager.cpp
index b4969bae39..3ff41a85b1 100644
--- a/interface/src/avatar/AvatarManager.cpp
+++ b/interface/src/avatar/AvatarManager.cpp
@@ -148,6 +148,10 @@ void AvatarManager::processAvatarMixerDatagram(const QByteArray& datagram, const
     }
 }
 
+AvatarSharedPointer AvatarManager::newSharedAvatar() {
+    return AvatarSharedPointer(new Avatar());
+}
+
 AvatarHash::iterator AvatarManager::erase(const AvatarHash::iterator& iterator) {
     if (iterator.key() != MY_AVATAR_KEY) {
         qDebug() << "Removing Avatar with UUID" << iterator.key() << "from AvatarManager hash.";
diff --git a/interface/src/avatar/AvatarManager.h b/interface/src/avatar/AvatarManager.h
index 1b72052c7e..a31162ec1a 100644
--- a/interface/src/avatar/AvatarManager.h
+++ b/interface/src/avatar/AvatarManager.h
@@ -45,6 +45,8 @@ private:
     void simulateAvatarFades(float deltaTime);
     void renderAvatarFades(const glm::vec3& cameraPosition, Avatar::RenderMode renderMode);
     
+    AvatarSharedPointer newSharedAvatar();
+    
     // virtual override
     AvatarHash::iterator erase(const AvatarHash::iterator& iterator);
     
diff --git a/libraries/avatars/src/AvatarHashMap.cpp b/libraries/avatars/src/AvatarHashMap.cpp
index 5f2d27c1a6..f6ff848ffa 100644
--- a/libraries/avatars/src/AvatarHashMap.cpp
+++ b/libraries/avatars/src/AvatarHashMap.cpp
@@ -32,12 +32,11 @@ const qint64 AVATAR_SILENCE_THRESHOLD_MSECS = 5 * 1000;
 
 bool AvatarHashMap::shouldKillAvatar(const AvatarSharedPointer& sharedAvatar) {
     return (sharedAvatar->getOwningAvatarMixer() == NULL
-            && sharedAvatar->getLastUpdateTimer().elapsed() > AVATAR_SILENCE_THRESHOLD_MSECS);
+            || sharedAvatar->getLastUpdateTimer().elapsed() > AVATAR_SILENCE_THRESHOLD_MSECS);
 }
 
 AvatarSharedPointer AvatarHashMap::newSharedAvatar() {
-    AvatarData* avatarData = new AvatarData();
-    return AvatarSharedPointer(avatarData);
+    return AvatarSharedPointer(new AvatarData());
 }
 
 AvatarSharedPointer AvatarHashMap::matchingOrNewAvatar(const QUuid& sessionUUID, const QWeakPointer<Node>& mixerWeakPointer) {