History

resolve conflicts on merge with uptream/master

Stephen Birarda committed 11 years ago

Commit 821c16c2 parents 684d466 4e2cbb399 files · +2638 −5187Browse files

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

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+7−7
@@ -32,7 +32,7 @@ EntityScriptingInterface::EntityScriptingInterface() : · 31 unmodified lines
32 connect(nodeList.data(), &NodeList::canRezChanged, this, &EntityScriptingInterface::canRezChanged);32 connect(nodeList.data(), &NodeList::canRezChanged, this, &EntityScriptingInterface::canRezChanged);
33}33}
34 34
35void EntityScriptingInterface::queueEntityMessage(PacketType packetType,35void EntityScriptingInterface::queueEntityMessage(PacketType::Value packetType,
36 EntityItemID entityID, const EntityItemProperties& properties) {36 EntityItemID entityID, const EntityItemProperties& properties) {
37 getEntityPacketSender()->queueEditEntityMessage(packetType, entityID, properties);37 getEntityPacketSender()->queueEditEntityMessage(packetType, entityID, properties);
38}38}
@@ -93,7 +93,7 @@ QUuid EntityScriptingInterface::addEntity(const EntityItemProperties& properties · 54 unmodified lines
93 93
94 // queue the packet94 // queue the packet
95 if (success) {95 if (success) {
96 queueEntityMessage(PacketTypeEntityAdd, id, propertiesWithSimID);96 queueEntityMessage(PacketType::EntityAdd, id, propertiesWithSimID);
97 }97 }
98 98
99 return id;99 return id;
@@ -175,13 +175,13 @@ QUuid EntityScriptingInterface::editEntity(QUuid id, EntityItemProperties proper · 75 unmodified lines
175 entity->setLastBroadcast(usecTimestampNow());175 entity->setLastBroadcast(usecTimestampNow());
176 }176 }
177 _entityTree->unlock();177 _entityTree->unlock();
178 queueEntityMessage(PacketTypeEntityEdit, entityID, properties);178 queueEntityMessage(PacketType::EntityEdit, entityID, properties);
179 return id;179 return id;
180 }180 }
181 return QUuid();181 return QUuid();
182 }182 }
183 183
184 queueEntityMessage(PacketTypeEntityEdit, entityID, properties);184 queueEntityMessage(PacketType::EntityEdit, entityID, properties);
185 return id;185 return id;
186}186}
187 187
@@ -446,7 +446,7 @@ bool EntityScriptingInterface::setVoxels(QUuid entityID, · 258 unmodified lines
446 properties.setVoxelDataDirty();446 properties.setVoxelDataDirty();
447 properties.setLastEdited(now);447 properties.setLastEdited(now);
448 448
449 queueEntityMessage(PacketTypeEntityEdit, entityID, properties);449 queueEntityMessage(PacketType::EntityEdit, entityID, properties);
450 return true;450 return true;
451}451}
452 452
@@ -483,7 +483,7 @@ bool EntityScriptingInterface::setPoints(QUuid entityID, std::function<bool(Line · 30 unmodified lines
483 properties.setLastEdited(now);483 properties.setLastEdited(now);
484 484
485 485
486 queueEntityMessage(PacketTypeEntityEdit, entityID, properties);486 queueEntityMessage(PacketType::EntityEdit, entityID, properties);
487 return success;487 return success;
488}488}
489 489
@@ -555,7 +555,7 @@ bool EntityScriptingInterface::actionWorker(const QUuid& entityID, · 65 unmodified lines
555 properties.setActionDataDirty();555 properties.setActionDataDirty();
556 auto now = usecTimestampNow();556 auto now = usecTimestampNow();
557 properties.setLastEdited(now);557 properties.setLastEdited(now);
558 queueEntityMessage(PacketTypeEntityEdit, entityID, properties);558 queueEntityMessage(PacketType::EntityEdit, entityID, properties);
559 559
560 return success;560 return success;
561}561}