From 7f4399b0a38369b06093aea08b3d1494f80fe8c1 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Thu, 4 May 2017 19:16:15 -0700 Subject: [PATCH] fix name in entity-edit-an-overlay warning --- libraries/entities/src/EntityScriptingInterface.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/entities/src/EntityScriptingInterface.cpp b/libraries/entities/src/EntityScriptingInterface.cpp index 83bc2184a8..ffb65a2dba 100644 --- a/libraries/entities/src/EntityScriptingInterface.cpp +++ b/libraries/entities/src/EntityScriptingInterface.cpp @@ -467,8 +467,8 @@ QUuid EntityScriptingInterface::editEntity(QUuid id, const EntityItemProperties& } }); if (!entityFound) { - // attempt to get a name for the mystery ID - QString name = "unknown"; + // we've made an edit to an entity we don't know about, or to a non-entity. If it's a known non-entity, + // print a warning and don't send an edit packet to the entity-server. QSharedPointer parentFinder = DependencyManager::get(); if (parentFinder) { bool success; @@ -478,7 +478,7 @@ QUuid EntityScriptingInterface::editEntity(QUuid id, const EntityItemProperties& if (nestable) { NestableType nestableType = nestable->getNestableType(); if (nestableType == NestableType::Overlay || nestableType == NestableType::Avatar) { - qCWarning(entities) << "attempted edit on non-entity: " << id << name; + qCWarning(entities) << "attempted edit on non-entity: " << id << nestable->getName(); return QUuid(); // null UUID to indicate failure } }