Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities

interface/src/Application.cpp

@@ -261,8 +261,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
     connect(nodeList, SIGNAL(nodeKilled(SharedNodePointer)), SLOT(nodeKilled(SharedNodePointer)));
     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, &NodeList::uuidChanged, _myAvatar, &MyAvatar::setSessionUUID);
-    connect(nodeList, SIGNAL(uuidChanged(const QUuid&)), _myAvatar, SLOT(setSessionUUID(const QUuid&)));
     connect(nodeList, &NodeList::limitOfSilentDomainCheckInsReached, nodeList, &NodeList::reset);
 
     // connect to appropriate slots on AccountManager

libraries/avatars/src/AvatarData.h

@@ -290,7 +290,7 @@ public slots:
     void sendBillboardPacket();
     void setBillboardFromNetworkReply();
     void setJointMappingsFromNetworkReply();
-    void setSessionUUID(const QUuid& id) { _sessionUUID = id; }
+    void setSessionUUID(const QUuid& sessionUUID) { _sessionUUID = sessionUUID; }
     bool hasReferential();
     
 protected:

libraries/avatars/src/AvatarHashMap.cpp

@@ -9,19 +9,21 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include <NodeList.h>
 #include <PacketHeaders.h>
 
 #include "AvatarHashMap.h"
 
 AvatarHashMap::AvatarHashMap() :
-    _avatarHash()
+    _avatarHash(),
+    _lastOwnerSessionUUID()
 {
-    
+    connect(NodeList::getInstance(), &NodeList::uuidChanged, this, &AvatarHashMap::sessionUUIDChanged);
 }
 
-void AvatarHashMap::insert(const QUuid& id, AvatarSharedPointer avatar) {
+void AvatarHashMap::insert(const QUuid& sessionUUID, AvatarSharedPointer avatar) {
-    _avatarHash.insert(id, avatar);
+    _avatarHash.insert(sessionUUID, avatar);
-    avatar->setSessionUUID(id);
+    avatar->setSessionUUID(sessionUUID);
 }
 
 AvatarHash::iterator AvatarHashMap::erase(const AvatarHash::iterator& iterator) {
@@ -110,10 +112,16 @@ void AvatarHashMap::processAvatarDataPacket(const QByteArray &datagram, const QW
         QUuid sessionUUID = QUuid::fromRfc4122(datagram.mid(bytesRead, NUM_BYTES_RFC4122_UUID));
         bytesRead += NUM_BYTES_RFC4122_UUID;
         
+        if (sessionUUID != _lastOwnerSessionUUID) {
             AvatarSharedPointer matchingAvatarData = matchingOrNewAvatar(sessionUUID, mixerWeakPointer);
             
             // have the matching (or new) avatar parse the data from the packet
             bytesRead += matchingAvatarData->parseDataAtOffset(datagram, bytesRead);
+        } else {
+            // create a dummy AvatarData class to throw this data on the ground
+            AvatarData dummyData;
+            bytesRead += dummyData.parseDataAtOffset(datagram, bytesRead);
+        }
     }
 }
 
@@ -177,3 +185,7 @@ void AvatarHashMap::processKillAvatar(const QByteArray& datagram) {
         erase(matchedAvatar);
     }
 }
+
+void AvatarHashMap::sessionUUIDChanged(const QUuid& sessionUUID, const QUuid& oldUUID) {
+    _lastOwnerSessionUUID = oldUUID;
+}

libraries/avatars/src/AvatarHashMap.h

@@ -31,12 +31,15 @@ public:
     const AvatarHash& getAvatarHash() { return _avatarHash; }
     int size() const { return _avatarHash.size(); }
 
-    virtual void insert(const QUuid& id, AvatarSharedPointer avatar);
+    virtual void insert(const QUuid& sessionUUID, AvatarSharedPointer avatar);
     
 public slots:
     void processAvatarMixerDatagram(const QByteArray& datagram, const QWeakPointer<Node>& mixerWeakPointer);
     bool containsAvatarWithDisplayName(const QString& displayName);
     
+private slots:
+    void sessionUUIDChanged(const QUuid& sessionUUID, const QUuid& oldUUID);
+    
 protected:
     virtual AvatarHash::iterator erase(const AvatarHash::iterator& iterator);
     
@@ -51,6 +54,7 @@ protected:
     void processKillAvatar(const QByteArray& datagram);
 
     AvatarHash _avatarHash;
+    QUuid _lastOwnerSessionUUID;
 };
 
 #endif // hifi_AvatarHashMap_h

libraries/networking/src/LimitedNodeList.cpp

@@ -95,7 +95,7 @@ void LimitedNodeList::setSessionUUID(const QUuid& sessionUUID) {
     if (sessionUUID != oldUUID) {
         qDebug() << "NodeList UUID changed from" <<  uuidStringWithoutCurlyBraces(oldUUID)
         << "to" << uuidStringWithoutCurlyBraces(_sessionUUID);
-        emit uuidChanged(sessionUUID);
+        emit uuidChanged(sessionUUID, oldUUID);
     }
 }
 

libraries/networking/src/LimitedNodeList.h

@@ -107,7 +107,7 @@ public slots:
     
     void killNodeWithUUID(const QUuid& nodeUUID);
 signals:
-    void uuidChanged(const QUuid& ownerUUID);
+    void uuidChanged(const QUuid& ownerUUID, const QUuid& oldUUID);
     void nodeAdded(SharedNodePointer);
     void nodeKilled(SharedNodePointer);
 protected: