From b8232b5dfdc70db8cc811dce1815bb5e1ac2c60b Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Wed, 9 Apr 2014 08:11:15 -0700
Subject: [PATCH] AvatarData now stores sessionUUID

---
 interface/src/Application.cpp           | 5 ++++-
 libraries/avatars/src/AvatarData.cpp    | 1 +
 libraries/avatars/src/AvatarData.h      | 8 +++++---
 libraries/avatars/src/AvatarHashMap.cpp | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 15d45b614d..f8aaf45f7c 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1205,7 +1205,10 @@ 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.cpp b/libraries/avatars/src/AvatarData.cpp
index 930e3f7350..7bdd8fb752 100644
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@@ -32,6 +32,7 @@ using namespace std;
 QNetworkAccessManager* AvatarData::networkAccessManager = NULL;
 
 AvatarData::AvatarData() :
+    _sessionUUID(),
     _handPosition(0,0,0),
     _bodyYaw(-90.f),
     _bodyPitch(0.0f),
diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h
index 2637b5a0c3..0f4df39f87 100755
--- a/libraries/avatars/src/AvatarData.h
+++ b/libraries/avatars/src/AvatarData.h
@@ -94,12 +94,14 @@ class AvatarData : public QObject {
     Q_PROPERTY(QString faceModelURL READ getFaceModelURLFromScript WRITE setFaceModelURLFromScript)
     Q_PROPERTY(QString skeletonModelURL READ getSkeletonModelURLFromScript WRITE setSkeletonModelURLFromScript)
     Q_PROPERTY(QString billboardURL READ getBillboardURL WRITE setBillboardFromURL)
+
+    Q_PROPERTY(QUuid sessionUUID READ getSessionUUID);
 public:
     AvatarData();
     virtual ~AvatarData();
 
-    const QUuid& getSessionID() { return _sessionID; }
-    void setSessionID(const QUuid& id) { _sessionID = id; }
+    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; }
@@ -222,7 +224,7 @@ public slots:
     void sendBillboardPacket();
     void setBillboardFromNetworkReply();
 protected:
-    QUuid _sessionID;
+    QUuid _sessionUUID;
     glm::vec3 _position;
     glm::vec3 _handPosition;
 
diff --git a/libraries/avatars/src/AvatarHashMap.cpp b/libraries/avatars/src/AvatarHashMap.cpp
index 5a56e3d5dc..3dd5c9991f 100644
--- a/libraries/avatars/src/AvatarHashMap.cpp
+++ b/libraries/avatars/src/AvatarHashMap.cpp
@@ -15,7 +15,7 @@ AvatarHashMap::AvatarHashMap() :
 
 void AvatarHashMap::insert(const QUuid& id, AvatarSharedPointer avatar) {
     _avatarHash.insert(id, avatar);
-    avatar->setSessionID(id);
+    avatar->setSessionUUID(id);
 }
 
 AvatarHash::iterator AvatarHashMap::erase(const AvatarHash::iterator& iterator) {