From 3fe01ccf1037d91c221f429b6b42aec619066ccc Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Wed, 10 Feb 2016 18:32:05 -0800 Subject: [PATCH] cleanups --- libraries/entities/src/EntityTreeElement.cpp | 4 ++-- libraries/shared/src/SpatiallyNestable.cpp | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/libraries/entities/src/EntityTreeElement.cpp b/libraries/entities/src/EntityTreeElement.cpp index 5ae3d562b6..932d041795 100644 --- a/libraries/entities/src/EntityTreeElement.cpp +++ b/libraries/entities/src/EntityTreeElement.cpp @@ -314,9 +314,9 @@ OctreeElement::AppendState EntityTreeElement::appendElementData(OctreePacketData // before we consider including it. if (includeThisEntity) { success = true; - // we can't cull a parent-entity by it's dimensions because the child may be larger. we need to + // we can't cull a parent-entity by its dimensions because the child may be larger. we need to // avoid sending details about a child but not the parent. the parent's queryAACube should have - // been adjusted to encompase the queryAACube of the child. + // been adjusted to encompass the queryAACube of the child. AABox entityBounds = entity->hasChildren() ? AABox(entityCube) : entity->getAABox(success); if (!success) { // if this entity is a child of an avatar, the entity-server wont be able to determine its diff --git a/libraries/shared/src/SpatiallyNestable.cpp b/libraries/shared/src/SpatiallyNestable.cpp index 31654ca718..557b25d9b2 100644 --- a/libraries/shared/src/SpatiallyNestable.cpp +++ b/libraries/shared/src/SpatiallyNestable.cpp @@ -101,13 +101,11 @@ SpatiallyNestablePointer SpatiallyNestable::getParentPointer(bool& success) cons // we have a _parentID but no parent pointer, or our parent pointer was to the wrong thing QSharedPointer parentFinder = DependencyManager::get(); if (!parentFinder) { - qDebug() << "SpatiallyNestable::getParentPointer -- no parentFinder"; success = false; return nullptr; } _parent = parentFinder->find(parentID, success); if (!success) { - qDebug() << "parentFinder failed for " << parentID; return nullptr; } @@ -120,7 +118,6 @@ SpatiallyNestablePointer SpatiallyNestable::getParentPointer(bool& success) cons if (parent || parentID.isNull()) { success = true; } else { - qDebug() << "SpatiallyNestable::getParentPointer -- couldn't resolve parent: " << parentID; success = false; }