Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 6 files). Show all
Unified · Split
| @@ -492,10 +492,9 @@ QUuid EntityScriptingInterface::addEntity(const EntityItemProperties& properties · 491 unmodified lines | |||
| 492 | propertiesWithSimID.setCollisionless(true); | 492 | propertiesWithSimID.setCollisionless(true); |
| 493 | } | 493 | } |
| 494 | 494 | ||
| 495 | // the created time will be set in EntityTree::addEntity by recordCreationTime() | ||
| 495 | propertiesWithSimID.setLastEditedBy(sessionID); | 496 | propertiesWithSimID.setLastEditedBy(sessionID); |
| 496 | 497 | ||
| 497 | propertiesWithSimID.setActionData(QByteArray()); | ||
| 498 | |||
| 499 | bool scalesWithParent = propertiesWithSimID.getScalesWithParent(); | 498 | bool scalesWithParent = propertiesWithSimID.getScalesWithParent(); |
| 500 | 499 | ||
| 501 | propertiesWithSimID = convertPropertiesFromScriptSemantics(propertiesWithSimID, scalesWithParent); | 500 | propertiesWithSimID = convertPropertiesFromScriptSemantics(propertiesWithSimID, scalesWithParent); |
| @@ -676,8 +675,6 @@ QScriptValue EntityScriptingInterface::getMultipleEntityPropertiesInternal(QScri · 174 unmodified lines | |||
| 676 | psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::ID); | 675 | psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::ID); |
| 677 | } else if (extendedPropertyString == "type") { | 676 | } else if (extendedPropertyString == "type") { |
| 678 | psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::Type); | 677 | psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::Type); |
| 679 | } else if (extendedPropertyString == "created") { | ||
| 680 | psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::Created); | ||
| 681 | } else if (extendedPropertyString == "age") { | 678 | } else if (extendedPropertyString == "age") { |
| 682 | psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::Age); | 679 | psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::Age); |
| 683 | } else if (extendedPropertyString == "ageAsText") { | 680 | } else if (extendedPropertyString == "ageAsText") { |
| @@ -692,8 +689,6 @@ QScriptValue EntityScriptingInterface::getMultipleEntityPropertiesInternal(QScri · 8 unmodified lines | |||
| 692 | psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::RenderInfo); | 689 | psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::RenderInfo); |
| 693 | } else if (extendedPropertyString == "clientOnly") { | 690 | } else if (extendedPropertyString == "clientOnly") { |
| 694 | psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::ClientOnly); | 691 | psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::ClientOnly); |
| 695 | } else if (extendedPropertyString == "owningAvatarID") { | ||
| 696 | psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::OwningAvatarID); | ||
| 697 | } else if (extendedPropertyString == "avatarEntity") { | 692 | } else if (extendedPropertyString == "avatarEntity") { |
| 698 | psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::AvatarEntity); | 693 | psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::AvatarEntity); |
| 699 | } else if (extendedPropertyString == "localEntity") { | 694 | } else if (extendedPropertyString == "localEntity") { |
| @@ -859,8 +854,6 @@ QUuid EntityScriptingInterface::editEntity(QUuid id, const EntityItemProperties& · 159 unmodified lines | |||
| 859 | } | 854 | } |
| 860 | properties.setOwningAvatarID(entity->getOwningAvatarID()); | 855 | properties.setOwningAvatarID(entity->getOwningAvatarID()); |
| 861 | 856 | ||
| 862 | properties.setActionData(entity->getDynamicData()); | ||
| 863 | |||
| 864 | // make sure the properties has a type, so that the encode can know which properties to include | 857 | // make sure the properties has a type, so that the encode can know which properties to include |
| 865 | properties.setType(entity->getType()); | 858 | properties.setType(entity->getType()); |
| 866 | 859 | ||