From 892e0e7cbfcb573140461c641ec7afd216497cb0 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 12 Sep 2014 11:43:50 -0700 Subject: [PATCH] fix node auth url, NAN break on windows --- libraries/networking/src/AddressManager.cpp | 4 ++-- libraries/networking/src/LimitedNodeList.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/networking/src/AddressManager.cpp b/libraries/networking/src/AddressManager.cpp index e41dbe0e3a..f2e9ce64ab 100644 --- a/libraries/networking/src/AddressManager.cpp +++ b/libraries/networking/src/AddressManager.cpp @@ -190,7 +190,7 @@ bool AddressManager::handleRelativeViewpoint(const QString& lookupString) { tripleFloatRegex.cap(2).toFloat(), tripleFloatRegex.cap(3).toFloat()); - if (newPosition.x != NAN && newPosition.y != NAN && newPosition.z != NAN) { + if (!isNaN(newPosition.x) && !isNaN(newPosition.y) && !isNaN(newPosition.z)) { glm::vec3 newOrientation; // we may also have an orientation if (lookupString[tripleFloatRegex.matchedLength() - 1] == QChar('/') @@ -200,7 +200,7 @@ bool AddressManager::handleRelativeViewpoint(const QString& lookupString) { tripleFloatRegex.cap(2).toFloat(), tripleFloatRegex.cap(3).toFloat()); - if (newOrientation.x != NAN && newOrientation.y != NAN && newOrientation.z != NAN) { + if (!isNaN(newOrientation.x) && !isNaN(newOrientation.y) && !isNaN(newOrientation.z)) { emit locationChangeRequired(newPosition, true, newOrientation); return true; } else { diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp index 604f8c7434..f50f7493fb 100644 --- a/libraries/networking/src/LimitedNodeList.cpp +++ b/libraries/networking/src/LimitedNodeList.cpp @@ -33,7 +33,7 @@ const char SOLO_NODE_TYPES[2] = { NodeType::AudioMixer }; -const QUrl DEFAULT_NODE_AUTH_URL = QUrl("http://localhost:3000"); +const QUrl DEFAULT_NODE_AUTH_URL = QUrl("https://data.highfidelity.io"); LimitedNodeList* LimitedNodeList::_sharedInstance = NULL;