From 841f8cb86bfbc710336c6aee1986c0598b410040 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 22 May 2017 15:33:57 -0700
Subject: [PATCH] make sure AvatarData objects have the node session ID

---
 assignment-client/src/avatars/AvatarMixerClientData.cpp | 7 +++++++
 assignment-client/src/avatars/AvatarMixerClientData.h   | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/assignment-client/src/avatars/AvatarMixerClientData.cpp b/assignment-client/src/avatars/AvatarMixerClientData.cpp
index 15a7f50fa3..4d80bc7d17 100644
--- a/assignment-client/src/avatars/AvatarMixerClientData.cpp
+++ b/assignment-client/src/avatars/AvatarMixerClientData.cpp
@@ -16,7 +16,14 @@
 
 #include "AvatarMixerClientData.h"
 
+AvatarMixerClientData::AvatarMixerClientData(const QUuid& nodeID) :
+    NodeData(nodeID)
+{
+    _currentViewFrustum.invalidate();
 
+    // in case somebody calls getSessionUUID on the AvatarData instance, make sure it has the right ID
+    _avatar->setID(nodeID);
+}
 
 void AvatarMixerClientData::queuePacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer node) {
     if (!_packetQueue.node) {
diff --git a/assignment-client/src/avatars/AvatarMixerClientData.h b/assignment-client/src/avatars/AvatarMixerClientData.h
index 76519466b5..c905b10251 100644
--- a/assignment-client/src/avatars/AvatarMixerClientData.h
+++ b/assignment-client/src/avatars/AvatarMixerClientData.h
@@ -36,7 +36,7 @@ const QString INBOUND_AVATAR_DATA_STATS_KEY = "inbound_av_data_kbps";
 class AvatarMixerClientData : public NodeData {
     Q_OBJECT
 public:
-    AvatarMixerClientData(const QUuid& nodeID = QUuid()) : NodeData(nodeID) { _currentViewFrustum.invalidate(); }
+    AvatarMixerClientData(const QUuid& nodeID = QUuid());
     virtual ~AvatarMixerClientData() {}
     using HRCTime = p_high_resolution_clock::time_point;