From 01c1cb328f7642fa7ed7703c87149e5aadd70c9f Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Thu, 13 Oct 2016 15:05:13 -0700 Subject: [PATCH] don't change UNKNOWN_CREATED_TIME to 1 during addition of LAST_EDITED_SERVERSIDE_BUMP --- libraries/entities/src/EntityItemProperties.h | 1 + libraries/entities/src/EntityTree.cpp | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libraries/entities/src/EntityItemProperties.h b/libraries/entities/src/EntityItemProperties.h index 3468b7dcde..809828226a 100644 --- a/libraries/entities/src/EntityItemProperties.h +++ b/libraries/entities/src/EntityItemProperties.h @@ -365,6 +365,7 @@ inline QDebug operator<<(QDebug debug, const EntityItemProperties& properties) { DEBUG_PROPERTY_IF_CHANGED(debug, properties, Damping, damping, ""); DEBUG_PROPERTY_IF_CHANGED(debug, properties, Restitution, restitution, ""); DEBUG_PROPERTY_IF_CHANGED(debug, properties, Friction, friction, ""); + DEBUG_PROPERTY_IF_CHANGED(debug, properties, Created, created, ""); DEBUG_PROPERTY_IF_CHANGED(debug, properties, Lifetime, lifetime, ""); DEBUG_PROPERTY_IF_CHANGED(debug, properties, Script, script, ""); DEBUG_PROPERTY_IF_CHANGED(debug, properties, ScriptTimestamp, scriptTimestamp, ""); diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp index ffb6ec31e2..41da3874c7 100644 --- a/libraries/entities/src/EntityTree.cpp +++ b/libraries/entities/src/EntityTree.cpp @@ -945,7 +945,9 @@ int EntityTree::processEditPacketData(ReceivedMessage& message, const unsigned c properties.setLifetime(_maxTmpEntityLifetime); // also bump up the lastEdited time of the properties so that the interface that created this edit // will accept our adjustment to lifetime back into its own entity-tree. - properties.setLastEdited(properties.getLastEdited() + LAST_EDITED_SERVERSIDE_BUMP); + if (properties.getLastEdited() != UNKNOWN_CREATED_TIME) { + properties.setLastEdited(properties.getLastEdited() + LAST_EDITED_SERVERSIDE_BUMP); + } } }