From 5f838271987d44608b75504a2d29d624d8c9e0a0 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Sat, 6 Jun 2020 10:36:30 +1200 Subject: [PATCH] Fix not being able to delete entities in serverless domains --- libraries/entities/src/EntityScriptingInterface.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/entities/src/EntityScriptingInterface.cpp b/libraries/entities/src/EntityScriptingInterface.cpp index d68747b96c..fd83c99ca5 100644 --- a/libraries/entities/src/EntityScriptingInterface.cpp +++ b/libraries/entities/src/EntityScriptingInterface.cpp @@ -987,8 +987,8 @@ void EntityScriptingInterface::deleteEntity(const QUuid& id) { // Deleting an entity has consequences for linked children: some can be deleted but others can't. // Local- and my-avatar-entities can be deleted immediately, but other-avatar-entities can't be deleted - // by this context, and a domain-entity must rountrip through the entity-server for authorization. - if (entity->isDomainEntity()) { + // by this context, and a domain-entity must round trip through the entity-server for authorization. + if (entity->isDomainEntity() && !_entityTree->isServerlessMode()) { getEntityPacketSender()->queueEraseEntityMessage(id); } else { entitiesToDeleteImmediately.push_back(entity);