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
189189 }
190190
191191 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";
193193 propertiesWithSimID.setParentID(QUuid());
194194 }
195195
@@ -370,7 +370,7 @@ QUuid EntityScriptingInterface::editEntity(QUuid id, const EntityItemProperties& · 174 unmodified lines
370370 if (!scriptSideProperties.parentIDChanged()) {
371371 properties.setParentID(entity->getParentID());
372372 } 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";
374374 properties.setParentID(QUuid());
375375 }
376376 if (!scriptSideProperties.parentJointIndexChanged()) {
@@ -931,12 +931,12 @@ bool EntityScriptingInterface::actionWorker(const QUuid& entityID, · 554 unmodified lines
931931 EntitySimulationPointer simulation = _entityTree->getSimulation();
932932 entity = _entityTree->findEntityByEntityItemID(entityID);
933933 if (!entity) {
934− qDebug() << "actionWorker -- unknown entity" << entityID;
934+ qCDebug(entities) << "actionWorker -- unknown entity" << entityID;
935935 return;
936936 }
937937
938938 if (!simulation) {
939− qDebug() << "actionWorker -- no simulation" << entityID;
939+ qCDebug(entities) << "actionWorker -- no simulation" << entityID;
940940 return;
941941 }
942942
@@ -1051,7 +1051,7 @@ EntityItemPointer EntityScriptingInterface::checkForTreeEntityAndTypeMatch(const · 108 unmodified lines
10511051
10521052 EntityItemPointer entity = _entityTree->findEntityByEntityItemID(entityID);
10531053 if (!entity) {
1054− qDebug() << "EntityScriptingInterface::checkForTreeEntityAndTypeMatch - no entity with ID" << entityID;
1054+ qCDebug(entities) << "EntityScriptingInterface::checkForTreeEntityAndTypeMatch - no entity with ID" << entityID;
10551055 return entity;
10561056 }
10571057
@@ -1311,7 +1311,7 @@ QVector<QUuid> EntityScriptingInterface::getChildrenIDs(const QUuid& parentID) { · 253 unmodified lines
13111311
13121312 EntityItemPointer entity = _entityTree->findEntityByEntityItemID(parentID);
13131313 if (!entity) {
1314− qDebug() << "EntityScriptingInterface::getChildrenIDs - no entity with ID" << parentID;
1314+ qCDebug(entities) << "EntityScriptingInterface::getChildrenIDs - no entity with ID" << parentID;
13151315 return result;
13161316 }
13171317