From 85a5d7059c1787e90d60d6853e1b1017d4b06d6a Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 15 Jul 2015 15:56:31 -0700 Subject: [PATCH 1/2] fix naming of variable in timePingReply --- libraries/networking/src/NodeList.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp index 76148935f1..3862d5ecdc 100644 --- a/libraries/networking/src/NodeList.cpp +++ b/libraries/networking/src/NodeList.cpp @@ -138,8 +138,8 @@ void NodeList::timePingReply(QSharedPointer packet, const SharedNodePo // The other node's expected time should be our original time plus the one way flight time // anything other than that is clock skew - quint64 othersExprectedReply = ourOriginalTime + oneWayFlightTime; - int clockSkew = othersReplyTime - othersExprectedReply; + quint64 othersExpectedReply = ourOriginalTime + oneWayFlightTime; + int clockSkew = othersReplyTime - othersExpectedReply; sendingNode->setPingMs(pingTime / 1000); sendingNode->updateClockSkewUsec(clockSkew); @@ -153,7 +153,7 @@ void NodeList::timePingReply(QSharedPointer packet, const SharedNodePo " pingTime: " << pingTime << "\n" << " oneWayFlightTime: " << oneWayFlightTime << "\n" << " othersReplyTime: " << othersReplyTime << "\n" << - " othersExprectedReply: " << othersExprectedReply << "\n" << + " othersExprectedReply: " << othersExpectedReply << "\n" << " clockSkew: " << clockSkew << "\n" << " average clockSkew: " << sendingNode->getClockSkewUsec(); } From 97936c82f2a4b33ecee2d7fb7f9f5d0d1c3be172 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 15 Jul 2015 15:58:05 -0700 Subject: [PATCH 2/2] add a missing library link --- libraries/render-utils/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/render-utils/CMakeLists.txt b/libraries/render-utils/CMakeLists.txt index 7feb48a52b..9d3b4a441f 100644 --- a/libraries/render-utils/CMakeLists.txt +++ b/libraries/render-utils/CMakeLists.txt @@ -34,4 +34,4 @@ if (WIN32) target_include_directories(${TARGET_NAME} PUBLIC ${OGLPLUS_INCLUDE_DIRS}) endif (WIN32) -link_hifi_libraries(animation fbx shared gpu model render) +link_hifi_libraries(animation fbx shared gpu model render environment)