rename NodeList ownerUUID to sessionUUID

assignment-client/src/AssignmentClient.cpp

@@ -131,7 +131,7 @@ void AssignmentClient::readPendingDatagrams() {
                         // switch our nodelist domain IP and port to whoever sent us the assignment
                         
                         nodeList->setDomainSockAddr(senderSockAddr);
-                        nodeList->setOwnerUUID(_currentAssignment->getUUID());
+                        nodeList->setSessionUUID(_currentAssignment->getUUID());
                         
                         qDebug() << "Destination IP for assignment is" << nodeList->getDomainIP().toString();
                         

interface/src/Application.cpp

@@ -3850,7 +3850,7 @@ void Application::updateWindowTitle(){
     QString buildVersion = " (build " + applicationVersion() + ")";
     NodeList* nodeList = NodeList::getInstance();
     
-    QString title = QString() + _profile.getUsername() + " " + nodeList->getOwnerUUID().toString()
+    QString title = QString() + _profile.getUsername() + " " + nodeList->getSessionUUID().toString()
         + " @ " + nodeList->getDomainHostname() + buildVersion;
 
     qDebug("Application title set to: %s", title.toStdString().c_str());

libraries/avatars/src/AvatarData.h

@@ -73,7 +73,7 @@ class AvatarData : public NodeData {
 
     Q_PROPERTY(glm::quat orientation READ getOrientation WRITE setOrientation)
     Q_PROPERTY(float headPitch READ getHeadPitch WRITE setHeadPitch)
-
+    
 public:
     AvatarData();
     ~AvatarData();

libraries/script-engine/src/DataServerScriptingInterface.cpp

@@ -17,5 +17,5 @@ DataServerScriptingInterface::DataServerScriptingInterface()
 }
 
 void DataServerScriptingInterface::setValueForKey(const QString& key, const QString& value) {
-    DataServerClient::putValueForKeyAndUUID(key, value, NodeList::getInstance()->getOwnerUUID());
+    DataServerClient::putValueForKeyAndUUID(key, value, NodeList::getInstance()->getSessionUUID());
 }

libraries/shared/src/NodeList.cpp

@@ -64,7 +64,7 @@ NodeList::NodeList(char newOwnerType, unsigned short int newSocketListenPort) :
     _nodeSocket(this),
     _ownerType(newOwnerType),
     _nodeTypesOfInterest(),
-    _ownerUUID(),
+    _sessionUUID(),
     _numNoReplyDomainCheckIns(0),
     _assignmentServerSocket(),
     _publicSockAddr(),
@@ -257,7 +257,7 @@ void NodeList::reset() {
     _nodeTypesOfInterest.clear();
 
     // refresh the owner UUID
-    _ownerUUID = QUuid::createUuid();
+    _sessionUUID = QUuid::createUuid();
 }
 
 void NodeList::addNodeTypeToInterestSet(NodeType_t nodeTypeToAdd) {
@@ -492,13 +492,13 @@ void NodeList::sendDomainServerCheckIn() {
     }
 }
 
-void NodeList::setOwnerUUID(const QUuid& ownerUUID) {
-    QUuid oldUUID = _ownerUUID;
-    _ownerUUID = ownerUUID;
+void NodeList::setSessionUUID(const QUuid& sessionUUID) {
+    QUuid oldUUID = _sessionUUID;
+    _sessionUUID = sessionUUID;
     
-    if (ownerUUID != oldUUID) {
-        qDebug() << "NodeList UUID changed from" << oldUUID << "to" << _ownerUUID;
-        emit uuidChanged(ownerUUID);
+    if (sessionUUID != oldUUID) {
+        qDebug() << "NodeList UUID changed from" << oldUUID << "to" << _sessionUUID;
+        emit uuidChanged(sessionUUID);
     }
 }
 
@@ -522,7 +522,7 @@ int NodeList::processDomainServerList(const QByteArray& packet) {
     // pull our owner UUID from the packet, it's always the first thing
     QUuid newUUID;
     packetStream >> newUUID;
-    setOwnerUUID(newUUID);
+    setSessionUUID(newUUID);
     
     // pull each node in the packet
     while(packetStream.device()->pos() < packet.size()) {

libraries/shared/src/NodeList.h

@@ -72,8 +72,8 @@ public:
 
     unsigned short getDomainPort() const { return _domainSockAddr.getPort(); }
 
-    const QUuid& getOwnerUUID() const { return _ownerUUID; }
-    void setOwnerUUID(const QUuid& ownerUUID);
+    const QUuid& getSessionUUID() const { return _sessionUUID; }
+    void setSessionUUID(const QUuid& sessionUUID);
 
     QUdpSocket& getNodeSocket() { return _nodeSocket; }
 
@@ -146,7 +146,7 @@ private:
     QUdpSocket _nodeSocket;
     NodeType_t _ownerType;
     NodeSet _nodeTypesOfInterest;
-    QUuid _ownerUUID;
+    QUuid _sessionUUID;
     int _numNoReplyDomainCheckIns;
     HifiSockAddr _assignmentServerSocket;
     HifiSockAddr _publicSockAddr;

libraries/shared/src/PacketHeaders.cpp

@@ -69,7 +69,7 @@ int populatePacketHeader(char* packet, PacketType type, const QUuid& connectionU
     int numTypeBytes = packArithmeticallyCodedValue(type, packet);
     packet[numTypeBytes] = versionForPacketType(type);
     
-    QUuid packUUID = connectionUUID.isNull() ? NodeList::getInstance()->getOwnerUUID() : connectionUUID;
+    QUuid packUUID = connectionUUID.isNull() ? NodeList::getInstance()->getSessionUUID() : connectionUUID;
     
     QByteArray rfcUUID = packUUID.toRfc4122();
     memcpy(packet + numTypeBytes + sizeof(PacketVersion), rfcUUID.constData(), NUM_BYTES_RFC4122_UUID);