Merge pull request #9584 from birarda/bug/freeze-dont-move

don't auto-bid for sim ownership on entity creation in ESI
This commit is contained in:
Ryan Huffman 2017-02-03 10:08:48 -08:00 committed by GitHub
commit 1ddafa3cee

View file

@ -218,17 +218,6 @@ QUuid EntityScriptingInterface::addEntity(const EntityItemProperties& properties
}
}
if (_bidOnSimulationOwnership) {
// This Node is creating a new object. If it's in motion, set this Node as the simulator.
auto nodeList = DependencyManager::get<NodeList>();
const QUuid myNodeID = nodeList->getSessionUUID();
// and make note of it now, so we can act on it right away.
propertiesWithSimID.setSimulationOwner(myNodeID, SCRIPT_POKE_SIMULATION_PRIORITY);
entity->setSimulationOwner(myNodeID, SCRIPT_POKE_SIMULATION_PRIORITY);
entity->rememberHasSimulationOwnershipBid();
}
entity->setLastBroadcast(usecTimestampNow());
propertiesWithSimID.setLastEdited(entity->getLastEdited());
} else {