History

flash yellow box when transmitting an edit packet

Seth Alves committed 11 years ago

Commit 5ac85581 parent cc5f2ee6 files · +21 −11Browse files

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

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+2−0
@@ -86,6 +86,7 @@ EntityItemID EntityScriptingInterface::addEntity(const EntityItemProperties& pro · 85 unmodified lines
86 if (_entityTree) {86 if (_entityTree) {
87 _entityTree->lockForWrite();87 _entityTree->lockForWrite();
88 EntityItem* entity = _entityTree->addEntity(id, propertiesWithSimID);88 EntityItem* entity = _entityTree->addEntity(id, propertiesWithSimID);
89 entity->setLastBroadcast(usecTimestampNow());
89 if (entity) {90 if (entity) {
90 // This Node is creating a new object. If it's in motion, set this Node as the simulator.91 // This Node is creating a new object. If it's in motion, set this Node as the simulator.
91 setSimId(propertiesWithSimID, entity);92 setSimId(propertiesWithSimID, entity);
@@ -178,6 +179,7 @@ EntityItemID EntityScriptingInterface::editEntity(EntityItemID entityID, const E · 86 unmodified lines
178 if (propertiesWithSimID.getType() == EntityTypes::Unknown) {179 if (propertiesWithSimID.getType() == EntityTypes::Unknown) {
179 EntityItem* entity = _entityTree->findEntityByEntityItemID(entityID);180 EntityItem* entity = _entityTree->findEntityByEntityItemID(entityID);
180 if (entity) {181 if (entity) {
182 entity->setLastBroadcast(usecTimestampNow());
181 propertiesWithSimID.setType(entity->getType());183 propertiesWithSimID.setType(entity->getType());
182 setSimId(propertiesWithSimID, entity);184 setSimId(propertiesWithSimID, entity);
183 }185 }