Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 09:44:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix bug that was making action deletes fail

Browse source
This commit is contained in:
Seth Alves 2015-10-13 16:19:12 -07:00
parent 4fa85441b8
commit 2ecb7e8d29
3 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
assignment-client/src/AssignmentAction.cpp
View file

@ -25,6 +25,7 @@ AssignmentAction::~AssignmentAction() {
void AssignmentAction::removeFromSimulation(EntitySimulation* simulation) const {
simulation->removeAction(_id);
simulation->applyActionChanges();
}
QByteArray AssignmentAction::serialize() const {

5
interface/src/avatar/AvatarActionHold.cpp
View file

@ -110,11 +110,6 @@ bool AvatarActionHold::updateArguments(QVariantMap arguments) {
ok = true;
auto myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
auto holderID = myAvatar->getSessionUUID();
// QString holderIDString =
// EntityActionInterface::extractStringArgument("hold", arguments, "hand", ok, false);
// if (ok) {
// holderID = QUuid(holderIDString);
// }
if (relativePosition != _relativePosition
|| relativeRotation != _relativeRotation

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

@ -1720,9 +1720,11 @@ void EntityItem::setActionData(QByteArray actionData) {
void EntityItem::setActionDataInternal(QByteArray actionData) {
assertWriteLocked();
if (_allActionsDataCache != actionData) {
_allActionsDataCache = actionData;
deserializeActionsInternal();
}
checkWaitingToRemove();
_allActionsDataCache = actionData;
deserializeActionsInternal();
}
void EntityItem::serializeActions(bool& success, QByteArray& result) const {