Merge pull request #15187 from SamGondelman/wearables

Case 21721: Fix wearable duplication on domain switch

interface/src/Application.cpp

@@ -5772,6 +5772,7 @@ void Application::reloadResourceCaches() {
 
     queryOctree(NodeType::EntityServer, PacketType::EntityQuery);
 
+    getMyAvatar()->prepareAvatarEntityDataForReload();
     // Clear the entities and their renderables
     getEntities()->clear();
 
@@ -6947,9 +6948,6 @@ void Application::updateWindowTitle() const {
 }
 
 void Application::clearDomainOctreeDetails(bool clearAll) {
-    // before we delete all entities get MyAvatar's AvatarEntityData ready
-    getMyAvatar()->prepareAvatarEntityDataForReload();
-
     // if we're about to quit, we really don't need to do the rest of these things...
     if (_aboutToQuit) {
         return;

interface/src/avatar/MyAvatar.cpp

@@ -3450,6 +3450,34 @@ float MyAvatar::getGravity() {
     return _characterController.getGravity();
 }
 
+void MyAvatar::setSessionUUID(const QUuid& sessionUUID) {
+    QUuid oldID = getSessionUUID();
+    Avatar::setSessionUUID(sessionUUID);
+    QUuid id = getSessionUUID();
+    if (id != oldID) {
+        auto treeRenderer = DependencyManager::get<EntityTreeRenderer>();
+        EntityTreePointer entityTree = treeRenderer ? treeRenderer->getTree() : nullptr;
+        if (entityTree) {
+            QList<QUuid> avatarEntityIDs;
+            _avatarEntitiesLock.withReadLock([&] {
+                avatarEntityIDs = _packedAvatarEntityData.keys();
+            });
+            entityTree->withWriteLock([&] {
+                for (const auto& entityID : avatarEntityIDs) {
+                    auto entity = entityTree->findEntityByID(entityID);
+                    if (!entity) {
+                        continue;
+                    }
+                    entity->setOwningAvatarID(id);
+                    if (entity->getParentID() == oldID) {
+                        entity->setParentID(id);
+                    }
+                }
+            });
+        }
+    }
+}
+
 void MyAvatar::increaseSize() {
     float minScale = getDomainMinScale();
     float maxScale = getDomainMaxScale();

interface/src/avatar/MyAvatar.h

@@ -1213,6 +1213,12 @@ public:
 
 public slots:
 
+   /**jsdoc
+    * @function MyAvatar.setSessionUUID
+    * @param {Uuid} sessionUUID
+    */
+    virtual void setSessionUUID(const QUuid& sessionUUID) override;
+
     /**jsdoc
      * Increase the avatar's scale by five percent, up to a minimum scale of <code>1000</code>.
      * @function MyAvatar.increaseSize

libraries/entities/src/EntityScriptingInterface.cpp

@@ -1646,11 +1646,9 @@ bool EntityScriptingInterface::actionWorker(const QUuid& entityID,
     auto nodeList = DependencyManager::get<NodeList>();
     const QUuid myNodeID = nodeList->getSessionUUID();
 
-    EntityItemProperties properties;
-
     EntityItemPointer entity;
     bool doTransmit = false;
-    _entityTree->withWriteLock([this, &entity, entityID, myNodeID, &doTransmit, actor, &properties] {
+    _entityTree->withWriteLock([this, &entity, entityID, myNodeID, &doTransmit, actor] {
         EntitySimulationPointer simulation = _entityTree->getSimulation();
         entity = _entityTree->findEntityByEntityItemID(entityID);
         if (!entity) {
@@ -1669,16 +1667,12 @@ bool EntityScriptingInterface::actionWorker(const QUuid& entityID,
 
         doTransmit = actor(simulation, entity);
         _entityTree->entityChanged(entity);
-        if (doTransmit) {
-            properties.setEntityHostType(entity->getEntityHostType());
-            properties.setOwningAvatarID(entity->getOwningAvatarID());
-        }
     });
 
     // transmit the change
     if (doTransmit) {
-        _entityTree->withReadLock([&] {
+        EntityItemProperties properties = _entityTree->resultWithReadLock<EntityItemProperties>([&] {
-            properties = entity->getProperties();
+            return entity->getProperties();
         });
 
         properties.setActionDataDirty();