History

shouldn't be able to write actionData

SamGondelman committed 7 years ago

Commit e8d45c41 parent 9b886ff1 file · +4 −0Browse files

Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 1 file). Show all

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+4−0
@@ -486,6 +486,8 @@ QUuid EntityScriptingInterface::addEntity(const EntityItemProperties& properties · 485 unmodified lines
486 486
487 propertiesWithSimID.setLastEditedBy(sessionID);487 propertiesWithSimID.setLastEditedBy(sessionID);
488 488
489 propertiesWithSimID.setActionData(QByteArray());
490
489 bool scalesWithParent = propertiesWithSimID.getScalesWithParent();491 bool scalesWithParent = propertiesWithSimID.getScalesWithParent();
490 492
491 propertiesWithSimID = convertPropertiesFromScriptSemantics(propertiesWithSimID, scalesWithParent);493 propertiesWithSimID = convertPropertiesFromScriptSemantics(propertiesWithSimID, scalesWithParent);
@@ -830,6 +832,8 @@ QUuid EntityScriptingInterface::editEntity(QUuid id, const EntityItemProperties& · 338 unmodified lines
830 properties.setClientOnly(entity->getClientOnly());832 properties.setClientOnly(entity->getClientOnly());
831 properties.setOwningAvatarID(entity->getOwningAvatarID());833 properties.setOwningAvatarID(entity->getOwningAvatarID());
832 834
835 properties.setActionData(entity->getDynamicData());
836
833 // make sure the properties has a type, so that the encode can know which properties to include837 // make sure the properties has a type, so that the encode can know which properties to include
834 properties.setType(entity->getType());838 properties.setType(entity->getType());
835 839