merge from upstream

Seth Alves committed 11 years ago

Commit 9c4fdfd2 parents 8a60bba e06461e197 files · +8488 −1901Browse files

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

Unified · Split

@@ -32,7 +32,7 @@ EntityScriptingInterface::EntityScriptingInterface() : · 31 unmodified lines
32	32	connect(nodeList.data(), &NodeList::canRezChanged, this, &EntityScriptingInterface::canRezChanged);
33	33	}
34	34
35		−void EntityScriptingInterface::queueEntityMessage(PacketType::Value packetType,
	35	+void EntityScriptingInterface::queueEntityMessage(PacketType packetType,
36	36	EntityItemID entityID, const EntityItemProperties& properties) {
37	37	getEntityPacketSender()->queueEditEntityMessage(packetType, entityID, properties);
38	38	}