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
3232 connect(nodeList.data(), &NodeList::canRezChanged, this, &EntityScriptingInterface::canRezChanged);
3333 }
3434
35−void EntityScriptingInterface::queueEntityMessage(PacketType packetType,
35+void EntityScriptingInterface::queueEntityMessage(PacketType::Value packetType,
3636 EntityItemID entityID, const EntityItemProperties& properties) {
3737 getEntityPacketSender()->queueEditEntityMessage(packetType, entityID, properties);
3838 }
@@ -93,7 +93,7 @@ QUuid EntityScriptingInterface::addEntity(const EntityItemProperties& properties · 54 unmodified lines
9393
9494 // queue the packet
9595 if (success) {
96− queueEntityMessage(PacketTypeEntityAdd, id, propertiesWithSimID);
96+ queueEntityMessage(PacketType::EntityAdd, id, propertiesWithSimID);
9797 }
9898
9999 return id;
@@ -175,13 +175,13 @@ QUuid EntityScriptingInterface::editEntity(QUuid id, EntityItemProperties proper · 75 unmodified lines
175175 entity->setLastBroadcast(usecTimestampNow());
176176 }
177177 _entityTree->unlock();
178− queueEntityMessage(PacketTypeEntityEdit, entityID, properties);
178+ queueEntityMessage(PacketType::EntityEdit, entityID, properties);
179179 return id;
180180 }
181181 return QUuid();
182182 }
183183
184− queueEntityMessage(PacketTypeEntityEdit, entityID, properties);
184+ queueEntityMessage(PacketType::EntityEdit, entityID, properties);
185185 return id;
186186 }
187187
@@ -446,7 +446,7 @@ bool EntityScriptingInterface::setVoxels(QUuid entityID, · 258 unmodified lines
446446 properties.setVoxelDataDirty();
447447 properties.setLastEdited(now);
448448
449− queueEntityMessage(PacketTypeEntityEdit, entityID, properties);
449+ queueEntityMessage(PacketType::EntityEdit, entityID, properties);
450450 return true;
451451 }
452452
@@ -483,7 +483,7 @@ bool EntityScriptingInterface::setPoints(QUuid entityID, std::function<bool(Line · 30 unmodified lines
483483 properties.setLastEdited(now);
484484
485485
486− queueEntityMessage(PacketTypeEntityEdit, entityID, properties);
486+ queueEntityMessage(PacketType::EntityEdit, entityID, properties);
487487 return success;
488488 }
489489
@@ -555,7 +555,7 @@ bool EntityScriptingInterface::actionWorker(const QUuid& entityID, · 65 unmodified lines
555555 properties.setActionDataDirty();
556556 auto now = usecTimestampNow();
557557 properties.setLastEdited(now);
558− queueEntityMessage(PacketTypeEntityEdit, entityID, properties);
558+ queueEntityMessage(PacketType::EntityEdit, entityID, properties);
559559
560560 return success;
561561 }