From bc7fb10ab95c3f648a5bb1bd056568410fd4a593 Mon Sep 17 00:00:00 2001
From: Simon Walton <simon@highfidelity.io>
Date: Thu, 28 Mar 2019 17:54:35 -0700
Subject: [PATCH] Fixes from review

---
 assignment-client/src/avatars/AvatarMixer.cpp |  4 ++--
 assignment-client/src/avatars/AvatarMixer.h   | 11 +++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/assignment-client/src/avatars/AvatarMixer.cpp b/assignment-client/src/avatars/AvatarMixer.cpp
index 5f7e197c8f..9816cebf43 100644
--- a/assignment-client/src/avatars/AvatarMixer.cpp
+++ b/assignment-client/src/avatars/AvatarMixer.cpp
@@ -262,7 +262,7 @@ void AvatarMixer::start() {
         {
             if (_dirtyHeroStatus) {
                 _dirtyHeroStatus = false;
-                nodeList->nestedEach([&](NodeList::const_iterator cbegin, NodeList::const_iterator cend) {
+                nodeList->nestedEach([](NodeList::const_iterator cbegin, NodeList::const_iterator cend) {
                     std::for_each(cbegin, cend, [](const SharedNodePointer& node) {
                         if (node->getType() == NodeType::Agent) {
                             NodeData* nodeData = node->getLinkedData();
@@ -1108,7 +1108,7 @@ void AvatarMixer::entityAdded(EntityItem* entity) {
     if (entity->getType() == EntityTypes::Zone) {
         _dirtyHeroStatus = true;
         entity->registerChangeHandler([this](const EntityItemID& entityItemID) {
-            this->entityChange();
+            entityChange();
         });
     }
 }
diff --git a/assignment-client/src/avatars/AvatarMixer.h b/assignment-client/src/avatars/AvatarMixer.h
index f65f04f279..10dff5e8a4 100644
--- a/assignment-client/src/avatars/AvatarMixer.h
+++ b/assignment-client/src/avatars/AvatarMixer.h
@@ -46,6 +46,11 @@ public slots:
 
     void sendStatsPacket() override;
 
+    // Avatar zone possibly changed
+    void entityAdded(EntityItem* entity);
+    void entityRemoved(EntityItem* entity);
+    void entityChange();
+
 private slots:
     void queueIncomingPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer node);
     void handleAdjustAvatarSorting(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode);
@@ -147,12 +152,6 @@ private:
 
     AvatarMixerSlavePool _slavePool;
     SlaveSharedData _slaveSharedData;
-
-public slots:
-    // Avatar zone possibly changed
-    void entityAdded(EntityItem* entity);
-    void entityRemoved(EntityItem* entity);
-    void entityChange();
 };
 
 #endif // hifi_AvatarMixer_h