From a6750eafd8b0a7e6f90c30305c0773fb2c2d5270 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Wed, 22 Apr 2015 13:03:59 -0700 Subject: [PATCH] experimenting --- libraries/physics/src/EntityMotionState.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/physics/src/EntityMotionState.cpp b/libraries/physics/src/EntityMotionState.cpp index a8a4a31544..90c7a56b16 100644 --- a/libraries/physics/src/EntityMotionState.cpp +++ b/libraries/physics/src/EntityMotionState.cpp @@ -284,8 +284,8 @@ void EntityMotionState::sendUpdate(OctreeEditPacketSender* packetSender, uint32_ QUuid simulatorID = _entity->getSimulatorID(); if (_entity->getShouldClaimSimulationOwnership()) { - _entity->setSimulatorID(myNodeID); - properties.setSimulatorID(myNodeID); + // _entity->setSimulatorID(myNodeID); + // properties.setSimulatorID(myNodeID); _entity->setShouldClaimSimulationOwnership(false); } else if (simulatorID.isNull() && !(zeroSpeed && zeroSpin)) { @@ -294,8 +294,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 - _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.