resolve conflicts on merge with upstream/master

Stephen Birarda committed 10 years ago

Commit 4573e5c2 parents a7dfc99 85b8266325 files · +10929 −5218Browse files

Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 325 files). Show all

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+16−12

                                           const QVariantMap& arguments) {
     QUuid actionID = QUuid::createUuid();
     auto actionFactory = DependencyManager::get<EntityActionFactoryInterface>();
-    bool success = actionWorker(entityID, [&](EntitySimulation* simulation, EntityItemPointer entity) {
+    bool success = false;
+    actionWorker(entityID, [&](EntitySimulation* simulation, EntityItemPointer entity) {
             // create this action even if the entity doesn't have physics info.  it will often be the
             // case that a script adds an action immediately after an object is created, and the physicsInfo
             // is computed asynchronously.
                 return false;
             }
             EntityActionPointer action = actionFactory->factory(actionType, actionID, entity, arguments);
-            if (action) {
+            if (!action) {
-                entity->addAction(simulation, action);
+                return false;
-                auto nodeList = DependencyManager::get<NodeList>();
+            }
-                const QUuid myNodeID = nodeList->getSessionUUID();
+            success = entity->addAction(simulation, action);
-                if (entity->getSimulatorID() != myNodeID) {
+            auto nodeList = DependencyManager::get<NodeList>();
-                    entity->flagForOwnership();
+            const QUuid myNodeID = nodeList->getSessionUUID();
-                }
+            if (entity->getSimulatorID() != myNodeID) {
-                return true;
+                entity->flagForOwnership();
             }
-            return false;
+            return false; // Physics will cause a packet to be sent, so don't send from here.
         });
     if (success) {
         return actionID;
 }
 bool EntityScriptingInterface::deleteAction(const QUuid& entityID, const QUuid& actionID) {
-    return actionWorker(entityID, [&](EntitySimulation* simulation, EntityItemPointer entity) {
+    bool success = false;
-            return entity->removeAction(simulation, actionID);
+    actionWorker(entityID, [&](EntitySimulation* simulation, EntityItemPointer entity) {
+            success = entity->removeAction(simulation, actionID);
+            return false; // Physics will cause a packet to be sent, so don't send from here.
         });
+    return success;
 }
 QVector<QUuid> EntityScriptingInterface::getActionIDs(const QUuid& entityID) {