Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-16 17:16:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

rollback automatic priority promotion to RECRUIT

Browse source
This commit is contained in:
Andrew Meadows 2018-01-04 13:24:58 -08:00
parent 6638b1deae
commit a51d83c6e4
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/entities/src/EntityTree.cpp
View file

@ -354,11 +354,13 @@ bool EntityTree::updateEntity(EntityItemPointer entity, const EntityItemProperti
// else: We assume the sender really did believe it was the simulation owner when it sent // else: We assume the sender really did believe it was the simulation owner when it sent
} else if (submittedID == senderID) { } else if (submittedID == senderID) {
// the sender is trying to take or continue ownership // the sender is trying to take or continue ownership
if (entity->getSimulatorID().isNull() || entity->getSimulatorID() == senderID) { if (entity->getSimulatorID().isNull()) {
// the sender is taking or asserting ownership // the sender is taking ownership
// but we never grant priorities lower than RECRUIT
properties.promoteSimulationPriority(RECRUIT_SIMULATION_PRIORITY); properties.promoteSimulationPriority(RECRUIT_SIMULATION_PRIORITY);
simulationBlocked = false; simulationBlocked = false;
} else if (entity->getSimulatorID() == senderID) {
// the sender is asserting ownership, maybe changing priority
simulationBlocked = false;
} else { } else {
// the sender is trying to steal ownership from another simulator // the sender is trying to steal ownership from another simulator
// so we apply the rules for ownership change: // so we apply the rules for ownership change: