From 0556661d1362886e6c917882fb98c9e8aff1eb83 Mon Sep 17 00:00:00 2001 From: Faye Li Si Fi Date: Wed, 7 Dec 2016 15:40:21 -0800 Subject: [PATCH] getting rid of uneccessary flag, fix formatting, and getting it to work yay --- libraries/entities/src/EntityItem.cpp | 1 + libraries/entities/src/EntityItemProperties.cpp | 2 +- libraries/entities/src/EntityPropertyFlags.h | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp index 67a7417f9f..13bc1ac41f 100644 --- a/libraries/entities/src/EntityItem.cpp +++ b/libraries/entities/src/EntityItem.cpp @@ -1165,6 +1165,7 @@ EntityItemProperties EntityItem::getProperties(EntityPropertyFlags desiredProper properties._id = getID(); properties._idSet = true; properties._created = _created; + properties._lastEdited = _lastEdited; properties.setClientOnly(_clientOnly); properties.setOwningAvatarID(_owningAvatarID); diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp index ed908ffd85..ca3480d3f0 100644 --- a/libraries/entities/src/EntityItemProperties.cpp +++ b/libraries/entities/src/EntityItemProperties.cpp @@ -369,7 +369,7 @@ QScriptValue EntityItemProperties::copyToScriptValue(QScriptEngine* engine, bool COPY_PROPERTY_TO_QSCRIPTVALUE_GETTER_NO_SKIP(ageAsText, formatSecondsElapsed(getAge())); // gettable, but not settable } - COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_LAST_EDITED, lastEdited); + COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_LAST_EDITED_BY, lastEditedBy); COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_POSITION, position); COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_DIMENSIONS, dimensions); diff --git a/libraries/entities/src/EntityPropertyFlags.h b/libraries/entities/src/EntityPropertyFlags.h index 45eff36338..127f3d0eea 100644 --- a/libraries/entities/src/EntityPropertyFlags.h +++ b/libraries/entities/src/EntityPropertyFlags.h @@ -182,7 +182,6 @@ enum EntityPropertyList { PROP_LOCAL_ANGULAR_VELOCITY, // only used to convert values to and from scripts PROP_LAST_EDITED_BY, - PROP_LAST_EDITED, //////////////////////////////////////////////////////////////////////////////////////////////////// // ATTENTION: add new properties to end of list just ABOVE this line