From 78268001c4c7ca668d473a6df7d9170085f2b6d0 Mon Sep 17 00:00:00 2001 From: Dante Ruiz Date: Wed, 3 Oct 2018 15:13:42 -0700 Subject: [PATCH 1/2] reverting logic change --- interface/src/octree/SafeLanding.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/src/octree/SafeLanding.cpp b/interface/src/octree/SafeLanding.cpp index 62bd1b7b89..f1deb06e3b 100644 --- a/interface/src/octree/SafeLanding.cpp +++ b/interface/src/octree/SafeLanding.cpp @@ -116,10 +116,9 @@ bool SafeLanding::isLoadSequenceComplete() { _initialEnd = INVALID_SEQUENCE; _entityTree = nullptr; EntityTreeRenderer::setEntityLoadingPriorityFunction(StandardPriority); - return true; } - return false; + return !_trackingEntities; } float SafeLanding::loadingProgressPercentage() { @@ -150,9 +149,10 @@ bool SafeLanding::isSequenceNumbersComplete() { && endIter != _sequenceNumbers.end() && distance(startIter, endIter) == sequenceSize - 1)) { _trackingEntities = false; // Don't track anything else that comes in. + returnm true; } } - return !_trackingEntities; + return false; } bool isEntityPhysicsReady(const EntityItemPointer& entity) { From b46d2319b11e77552992186422a11a1beb0906eb Mon Sep 17 00:00:00 2001 From: Dante Ruiz Date: Wed, 3 Oct 2018 15:22:53 -0700 Subject: [PATCH 2/2] fix spelling error --- interface/src/octree/SafeLanding.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/octree/SafeLanding.cpp b/interface/src/octree/SafeLanding.cpp index f1deb06e3b..6b28d9c713 100644 --- a/interface/src/octree/SafeLanding.cpp +++ b/interface/src/octree/SafeLanding.cpp @@ -149,7 +149,7 @@ bool SafeLanding::isSequenceNumbersComplete() { && endIter != _sequenceNumbers.end() && distance(startIter, endIter) == sequenceSize - 1)) { _trackingEntities = false; // Don't track anything else that comes in. - returnm true; + return true; } } return false;