From 4b306401afd026e8a737af85d0520988c9998c9b Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Wed, 9 Apr 2014 11:32:52 -0700
Subject: [PATCH] use slot to change AvatarData::_sessionUUID

---
 interface/src/Application.cpp      | 6 +-----
 libraries/avatars/src/AvatarData.h | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 2a97e536e4..ae80cdef48 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -232,6 +232,7 @@ Application::Application(int& argc, char** argv, timeval &startup_time) :
     connect(nodeList, SIGNAL(nodeAdded(SharedNodePointer)), &_voxels, SLOT(nodeAdded(SharedNodePointer)));
     connect(nodeList, SIGNAL(nodeKilled(SharedNodePointer)), &_voxels, SLOT(nodeKilled(SharedNodePointer)));
     connect(nodeList, &NodeList::uuidChanged, this, &Application::updateWindowTitle);
+    connect(nodeList, SIGNAL(uuidChanged(const QUuid&)), _myAvatar, SLOT(setSessionUUID(const QUuid&)));
     connect(nodeList, &NodeList::limitOfSilentDomainCheckInsReached, nodeList, &NodeList::reset);
 
     // connect to appropriate slots on AccountManager
@@ -1216,11 +1217,6 @@ void Application::timer() {
 
     // ask the node list to check in with the domain server
     NodeList::getInstance()->sendDomainServerCheckIn();
-
-    // as soon as we have a valid sessionUUID, store it in the avatar for reference
-    if (_myAvatar->getSessionUUID().isNull()) {
-        _myAvatar->setSessionUUID(NodeList::getInstance()->getSessionUUID());
-    }
 }
 
 void Application::idle() {
diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h
index e8b287ceed..2b8dfe8861 100755
--- a/libraries/avatars/src/AvatarData.h
+++ b/libraries/avatars/src/AvatarData.h
@@ -102,7 +102,6 @@ public:
     virtual ~AvatarData();
 
     const QUuid& getSessionUUID() { return _sessionUUID; }
-    void setSessionUUID(const QUuid& id) { _sessionUUID = id; }
 
     const glm::vec3& getPosition() const { return _position; }
     void setPosition(const glm::vec3 position) { _position = position; }
@@ -225,6 +224,7 @@ public slots:
     void sendBillboardPacket();
     void setBillboardFromNetworkReply();
     void setJointMappingsFromNetworkReply();
+    void setSessionUUID(const QUuid& id) { _sessionUUID = id; }
 protected:
     QUuid _sessionUUID;
     glm::vec3 _position;