From 9f58865937644402c7bda40563c9f55ccb46c134 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Fri, 23 Jan 2015 11:46:11 -0800
Subject: [PATCH] Add AvatarHashMap and AvatarManager to DM

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

diff --git a/interface/src/avatar/AvatarManager.h b/interface/src/avatar/AvatarManager.h
index add6e45758..6b0240435a 100644
--- a/interface/src/avatar/AvatarManager.h
+++ b/interface/src/avatar/AvatarManager.h
@@ -24,6 +24,7 @@ class MyAvatar;
 
 class AvatarManager : public AvatarHashMap {
     Q_OBJECT
+    SINGLETON_DEPENDENCY
 
 public:
     
diff --git a/libraries/avatars/src/AvatarHashMap.cpp b/libraries/avatars/src/AvatarHashMap.cpp
index 3d5af17ab9..6203c5bcff 100644
--- a/libraries/avatars/src/AvatarHashMap.cpp
+++ b/libraries/avatars/src/AvatarHashMap.cpp
@@ -14,10 +14,7 @@
 
 #include "AvatarHashMap.h"
 
-AvatarHashMap::AvatarHashMap() :
-    _avatarHash(),
-    _lastOwnerSessionUUID()
-{
+AvatarHashMap::AvatarHashMap() {
     connect(DependencyManager::get<NodeList>().data(), &NodeList::uuidChanged, this, &AvatarHashMap::sessionUUIDChanged);
 }
 
diff --git a/libraries/avatars/src/AvatarHashMap.h b/libraries/avatars/src/AvatarHashMap.h
index 03b0bf887c..51a592c199 100644
--- a/libraries/avatars/src/AvatarHashMap.h
+++ b/libraries/avatars/src/AvatarHashMap.h
@@ -16,6 +16,7 @@
 #include <QtCore/QSharedPointer>
 #include <QtCore/QUuid>
 
+#include <DependencyManager.h>
 #include <Node.h>
 
 #include "AvatarData.h"
@@ -24,8 +25,10 @@ typedef QSharedPointer<AvatarData> AvatarSharedPointer;
 typedef QWeakPointer<AvatarData> AvatarWeakPointer;
 typedef QHash<QUuid, AvatarSharedPointer> AvatarHash;
 
-class AvatarHashMap : public QObject {
+class AvatarHashMap : public QObject, public Dependency {
     Q_OBJECT
+    SINGLETON_DEPENDENCY
+    
 public:
     AvatarHashMap();