History

Merge branch 'master' into tablet-ui

Anthony J. Thibault committed 9 years ago

Commit 00980362 parents 6729421 45c71fd173 files · +5924 −1762Browse files

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

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+6−6
@@ -189,7 +189,7 @@ QUuid EntityScriptingInterface::addEntity(const EntityItemProperties& properties · 188 unmodified lines
189 }189 }
190 190
191 if (propertiesWithSimID.getParentID() == AVATAR_SELF_ID) {191 if (propertiesWithSimID.getParentID() == AVATAR_SELF_ID) {
192 qDebug() << "ERROR: Cannot set entity parent ID to the local-only MyAvatar ID";192 qCDebug(entities) << "ERROR: Cannot set entity parent ID to the local-only MyAvatar ID";
193 propertiesWithSimID.setParentID(QUuid());193 propertiesWithSimID.setParentID(QUuid());
194 }194 }
195 195
@@ -370,7 +370,7 @@ QUuid EntityScriptingInterface::editEntity(QUuid id, const EntityItemProperties& · 174 unmodified lines
370 if (!scriptSideProperties.parentIDChanged()) {370 if (!scriptSideProperties.parentIDChanged()) {
371 properties.setParentID(entity->getParentID());371 properties.setParentID(entity->getParentID());
372 } else if (scriptSideProperties.getParentID() == AVATAR_SELF_ID) {372 } else if (scriptSideProperties.getParentID() == AVATAR_SELF_ID) {
373 qDebug() << "ERROR: Cannot set entity parent ID to the local-only MyAvatar ID";373 qCDebug(entities) << "ERROR: Cannot set entity parent ID to the local-only MyAvatar ID";
374 properties.setParentID(QUuid());374 properties.setParentID(QUuid());
375 }375 }
376 if (!scriptSideProperties.parentJointIndexChanged()) {376 if (!scriptSideProperties.parentJointIndexChanged()) {
@@ -931,12 +931,12 @@ bool EntityScriptingInterface::actionWorker(const QUuid& entityID, · 554 unmodified lines
931 EntitySimulationPointer simulation = _entityTree->getSimulation();931 EntitySimulationPointer simulation = _entityTree->getSimulation();
932 entity = _entityTree->findEntityByEntityItemID(entityID);932 entity = _entityTree->findEntityByEntityItemID(entityID);
933 if (!entity) {933 if (!entity) {
934 qDebug() << "actionWorker -- unknown entity" << entityID;934 qCDebug(entities) << "actionWorker -- unknown entity" << entityID;
935 return;935 return;
936 }936 }
937 937
938 if (!simulation) {938 if (!simulation) {
939 qDebug() << "actionWorker -- no simulation" << entityID;939 qCDebug(entities) << "actionWorker -- no simulation" << entityID;
940 return;940 return;
941 }941 }
942 942
@@ -1051,7 +1051,7 @@ EntityItemPointer EntityScriptingInterface::checkForTreeEntityAndTypeMatch(const · 108 unmodified lines
1051 1051
1052 EntityItemPointer entity = _entityTree->findEntityByEntityItemID(entityID);1052 EntityItemPointer entity = _entityTree->findEntityByEntityItemID(entityID);
1053 if (!entity) {1053 if (!entity) {
1054 qDebug() << "EntityScriptingInterface::checkForTreeEntityAndTypeMatch - no entity with ID" << entityID;1054 qCDebug(entities) << "EntityScriptingInterface::checkForTreeEntityAndTypeMatch - no entity with ID" << entityID;
1055 return entity;1055 return entity;
1056 }1056 }
1057 1057
@@ -1311,7 +1311,7 @@ QVector<QUuid> EntityScriptingInterface::getChildrenIDs(const QUuid& parentID) { · 253 unmodified lines
1311 1311
1312 EntityItemPointer entity = _entityTree->findEntityByEntityItemID(parentID);1312 EntityItemPointer entity = _entityTree->findEntityByEntityItemID(parentID);
1313 if (!entity) {1313 if (!entity) {
1314 qDebug() << "EntityScriptingInterface::getChildrenIDs - no entity with ID" << parentID;1314 qCDebug(entities) << "EntityScriptingInterface::getChildrenIDs - no entity with ID" << parentID;
1315 return result;1315 return result;
1316 }1316 }
1317 1317