From fe09a1a57cd379acd88db6e5fb127e780afefb1c Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Thu, 13 Oct 2016 16:45:37 -0700 Subject: [PATCH] make sure interface accepts server adjustment to lifetime, even for imported entities --- libraries/entities/src/EntityTree.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp index 41da3874c7..7de841a321 100644 --- a/libraries/entities/src/EntityTree.cpp +++ b/libraries/entities/src/EntityTree.cpp @@ -945,9 +945,10 @@ 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. - if (properties.getLastEdited() != UNKNOWN_CREATED_TIME) { - properties.setLastEdited(properties.getLastEdited() + LAST_EDITED_SERVERSIDE_BUMP); + if (properties.getLastEdited() == UNKNOWN_CREATED_TIME) { + properties.setLastEdited(usecTimestampNow()); } + properties.setLastEdited(properties.getLastEdited() + LAST_EDITED_SERVERSIDE_BUMP); } }