make sure interface accepts server adjustment to lifetime, even for imported entities

This commit is contained in:
Seth Alves 2016-10-13 16:45:37 -07:00
parent 01c1cb328f
commit fe09a1a57c

View file

@ -945,9 +945,10 @@ int EntityTree::processEditPacketData(ReceivedMessage& message, const unsigned c
properties.setLifetime(_maxTmpEntityLifetime); properties.setLifetime(_maxTmpEntityLifetime);
// also bump up the lastEdited time of the properties so that the interface that created this edit // 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. // will accept our adjustment to lifetime back into its own entity-tree.
if (properties.getLastEdited() != UNKNOWN_CREATED_TIME) { if (properties.getLastEdited() == UNKNOWN_CREATED_TIME) {
properties.setLastEdited(properties.getLastEdited() + LAST_EDITED_SERVERSIDE_BUMP); properties.setLastEdited(usecTimestampNow());
} }
properties.setLastEdited(properties.getLastEdited() + LAST_EDITED_SERVERSIDE_BUMP);
} }
} }