Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-18 05:21:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #11642 from sethalves/fix-action-deadlock

Browse source 
fix action (grab) deadlock
This commit is contained in:
Brad Hefta-Gaub 2017-10-21 12:27:40 -07:00 committed by GitHub
commit 6607be5b58
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/entities/src/EntityItem.cpp
View file

@ -2109,6 +2109,7 @@ bool EntityItem::addAction(EntitySimulationPointer simulation, EntityDynamicPoin
removeActionInternal(action->getID());
}
});
updateQueryAACube();
return result;
}
@ -2167,6 +2168,8 @@ bool EntityItem::removeAction(EntitySimulationPointer simulation, const QUuid& a
checkWaitingToRemove(simulation);
success = removeActionInternal(actionID);
});
updateQueryAACube();
return success;
}
@ -2194,7 +2197,6 @@ bool EntityItem::removeActionInternal(const QUuid& actionID, EntitySimulationPoi
_dirtyFlags |= Simulation::DIRTY_PHYSICS_ACTIVATION;
_dirtyFlags |= Simulation::DIRTY_COLLISION_GROUP; // may need to not collide with own avatar
setDynamicDataNeedsTransmit(true);
updateQueryAACube();
return success;
}
return false;