History

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

Zach Fox committed 8 years ago

Commit 90f05f42 parents 74655bd c534e3a58 files · +802 −475Browse files

Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 58 files). Show all

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+4−1
@@ -593,7 +593,10 @@ void EntityScriptingInterface::deleteEntity(QUuid id) { · 592 unmodified lines
593 if (entity->getLocked()) {593 if (entity->getLocked()) {
594 shouldDelete = false;594 shouldDelete = false;
595 } else {595 } else {
596 _entityTree->deleteEntity(entityID);596 // only delete local entities, server entities will round trip through the server filters
597 if (entity->getClientOnly()) {
598 _entityTree->deleteEntity(entityID);
599 }
597 }600 }
598 }601 }
599 });602 });