History

experimenting

Seth Alves committed 11 years ago

Commit dc30ca01 parent 41166c11 file · +4 −4Browse files

Showing the changes to libraries/physics/src/EntityMotionState.cpp (1 of 1 file). Show all

Unified · Split

libraries/physics/src/EntityMotionState.cpp+4−4
@@ -290,12 +290,12 @@ void EntityMotionState::sendUpdate(OctreeEditPacketSender* packetSender, uint32_ · 289 unmodified lines
290290 }
291291 else if (simulatorID.isNull() && !(zeroSpeed && zeroSpin)) {
292292 // The object is moving and nobody thinks they own the motion. set this Node as the simulator
293− _entity->setSimulatorID(myNodeID);
294− properties.setSimulatorID(myNodeID);
293+ // _entity->setSimulatorID(myNodeID);
294+ // properties.setSimulatorID(myNodeID);
295295 } else if (simulatorID == myNodeID && zeroSpeed && zeroSpin) {
296296 // we are the simulator and the object has stopped. give up "simulator" status
297− // _entity->setSimulatorID(QUuid());
298− // properties.setSimulatorID(QUuid());
297+ _entity->setSimulatorID(QUuid());
298+ properties.setSimulatorID(QUuid());
299299 }
300300
301301 // RELIABLE_SEND_HACK: count number of updates for entities at rest so we can stop sending them after some limit.