From fa66ed766dae10acbbf1fb444a435681152409d4 Mon Sep 17 00:00:00 2001 From: SamGondelman Date: Mon, 7 Jan 2019 12:31:52 -0800 Subject: [PATCH] one more try --- libraries/entities/src/EntityItem.cpp | 4 +++- libraries/entities/src/EntityItemProperties.cpp | 1 - libraries/entities/src/EntityItemProperties.h | 3 ++- libraries/entities/src/EntityItemPropertiesMacros.h | 10 ---------- 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp index 77ec215783..8c71499b78 100644 --- a/libraries/entities/src/EntityItem.cpp +++ b/libraries/entities/src/EntityItem.cpp @@ -901,8 +901,10 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef // from being received by an entity script server running a script that continously updates an entity. // Basically, we'll allow recent changes to the server scripts even if there are local changes to other properties // that have been made more recently. - bool overwriteLocalData = !ignoreServerPacket || (lastEditedFromBufferAdjusted > _serverScriptsChangedTimestamp); + bool oldOverwrite = overwriteLocalData; + overwriteLocalData = !ignoreServerPacket || (lastEditedFromBufferAdjusted > _serverScriptsChangedTimestamp); READ_ENTITY_PROPERTY(PROP_SERVER_SCRIPTS, QString, setServerScripts); + overwriteLocalData = oldOverwrite; } // Certifiable props diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp index 3e1538e797..4c06d7516c 100644 --- a/libraries/entities/src/EntityItemProperties.cpp +++ b/libraries/entities/src/EntityItemProperties.cpp @@ -341,7 +341,6 @@ void EntityItemProperties::setBillboardModeFromString(const QString& materialMap QString EntityItemProperties::getCreatedAsString() const { auto created = QDateTime::fromMSecsSinceEpoch(getCreated() / 1000.0f, Qt::UTC); // usec per msec - created.setTimeSpec(Qt::OffsetFromUTC); return created.toString(Qt::ISODate); } diff --git a/libraries/entities/src/EntityItemProperties.h b/libraries/entities/src/EntityItemProperties.h index 14742a924c..58cd78a4ec 100644 --- a/libraries/entities/src/EntityItemProperties.h +++ b/libraries/entities/src/EntityItemProperties.h @@ -21,6 +21,7 @@ #include #include #include +#include #include #include @@ -381,7 +382,7 @@ public: void setLocationDirty() { _positionChanged = true; _rotationChanged = true; } - void setCreatedFromString(QString& v) { _created = QDateTime::fromString(v, Qt::ISODate).toMSecsSinceEpoch() * 1000; } + void setCreatedFromString(QString& v) { _created = QDateTime::fromString(v.trimmed(), Qt::ISODate).toMSecsSinceEpoch() * 1000; } QString getCreatedAsString() const; bool hasTransformOrVelocityChanges() const; diff --git a/libraries/entities/src/EntityItemPropertiesMacros.h b/libraries/entities/src/EntityItemPropertiesMacros.h index 76723526db..90dbd68f9f 100644 --- a/libraries/entities/src/EntityItemPropertiesMacros.h +++ b/libraries/entities/src/EntityItemPropertiesMacros.h @@ -13,8 +13,6 @@ #ifndef hifi_EntityItemPropertiesMacros_h #define hifi_EntityItemPropertiesMacros_h -#include - #include "EntityItemID.h" #include @@ -234,14 +232,6 @@ inline QString QString_convertFromScriptValue(const QScriptValue& v, bool& isVal inline QUuid QUuid_convertFromScriptValue(const QScriptValue& v, bool& isValid) { isValid = true; return v.toVariant().toUuid(); } inline EntityItemID EntityItemID_convertFromScriptValue(const QScriptValue& v, bool& isValid) { isValid = true; return v.toVariant().toUuid(); } - -inline QDateTime QDateTime_convertFromScriptValue(const QScriptValue& v, bool& isValid) { - isValid = true; - auto result = QDateTime::fromString(v.toVariant().toString().trimmed(), Qt::ISODate); - // result.setTimeSpec(Qt::OffsetFromUTC); - return result; -} - inline QByteArray QByteArray_convertFromScriptValue(const QScriptValue& v, bool& isValid) { isValid = true; QString b64 = v.toVariant().toString().trimmed();