History

split entity-add and entity-edit messages

Seth Alves committed 11 years ago

Commit 4a59dc21 parent 124ff686 files · +26 −19Browse files

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

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+3−3
@@ -92,7 +92,7 @@ QUuid EntityScriptingInterface::addEntity(const EntityItemProperties& properties · 91 unmodified lines
92 92
93 // queue the packet93 // queue the packet
94 if (success) {94 if (success) {
95 queueEntityMessage(PacketTypeEntityAddOrEdit, id, propertiesWithSimID);95 queueEntityMessage(PacketTypeEntityAdd, id, propertiesWithSimID);
96 }96 }
97 97
98 return id;98 return id;
@@ -144,12 +144,12 @@ QUuid EntityScriptingInterface::editEntity(QUuid id, const EntityItemProperties& · 45 unmodified lines
144 entity->setLastBroadcast(usecTimestampNow());144 entity->setLastBroadcast(usecTimestampNow());
145 modifiedProperties.setType(entity->getType());145 modifiedProperties.setType(entity->getType());
146 bidForSimulationOwnership(modifiedProperties);146 bidForSimulationOwnership(modifiedProperties);
147 queueEntityMessage(PacketTypeEntityAddOrEdit, entityID, modifiedProperties);147 queueEntityMessage(PacketTypeEntityEdit, entityID, modifiedProperties);
148 return id;148 return id;
149 }149 }
150 }150 }
151 151
152 queueEntityMessage(PacketTypeEntityAddOrEdit, entityID, properties);152 queueEntityMessage(PacketTypeEntityEdit, entityID, properties);
153 return id;153 return id;
154}154}
155 155