Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-21 16:41:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

_lastEdited can only increase or be reset

Browse source
This commit is contained in:
Andrew Meadows 2019-11-19 08:44:33 -08:00
parent 08263b2672
commit 3b8275c240
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libraries/entities/src/EntityItem.cpp
View file

@ -2707,10 +2707,12 @@ quint64 EntityItem::getLastEdited() const {
} }
void EntityItem::setLastEdited(quint64 lastEdited) { void EntityItem::setLastEdited(quint64 lastEdited) {
withWriteLock([&] { if (lastEdited == 0 || lastEdited > _lastEdited) {
_lastEdited = _lastUpdated = lastEdited; withWriteLock([&] {
_changedOnServer = glm::max(lastEdited, _changedOnServer); _lastEdited = _lastUpdated = lastEdited;
}); _changedOnServer = glm::max(lastEdited, _changedOnServer);
});
}
} }
void EntityItem::markAsChangedOnServer() { void EntityItem::markAsChangedOnServer() {