From 62a45ccebb6e3ea9804217f472e4e1db06a6ebb6 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Thu, 16 Apr 2015 17:00:36 -0700 Subject: [PATCH] re-enable code that gives up simulation ownership --- libraries/physics/src/EntityMotionState.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libraries/physics/src/EntityMotionState.cpp b/libraries/physics/src/EntityMotionState.cpp index d54ee3571a..1324603bad 100644 --- a/libraries/physics/src/EntityMotionState.cpp +++ b/libraries/physics/src/EntityMotionState.cpp @@ -258,12 +258,8 @@ void EntityMotionState::sendUpdate(OctreeEditPacketSender* packetSender, uint32_ properties.setSimulatorID(myNodeID); } else if (simulatorID == myNodeID && zeroSpeed && zeroSpin) { // we are the simulator and the object has stopped. give up "simulator" status - - // XXX the entity server will clear the simulatorID after 2 seconds. if the interface clears - // it here, every node that sees the entity-stopped-moving packets will rebroadcast them. - - // _entity->setSimulatorID(QUuid()); - // properties.setSimulatorID(QUuid()); + _entity->setSimulatorID(QUuid()); + properties.setSimulatorID(QUuid()); } // RELIABLE_SEND_HACK: count number of updates for entities at rest so we can stop sending them after some limit.