From 2274b35d08ad3614c5d7bb2a4d8b0475ce549916 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 18 Nov 2014 15:35:11 -0800
Subject: [PATCH] connect to sandbox domain by default

---
 interface/src/Application.cpp             | 7 +++++--
 libraries/networking/src/AddressManager.h | 3 ++-
 libraries/networking/src/DomainHandler.h  | 2 --
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 31be016380..7cc7267f03 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1926,11 +1926,14 @@ void Application::init() {
         // check if we have a URL in settings to load to jump back to
         // we load this separate from the other settings so we don't double lookup a URL
         QSettings* interfaceSettings = lockSettings();
-        QUrl addressURL = interfaceSettings->value(SETTINGS_ADDRESS_KEY).toUrl();
+        QVariant addressVariant = interfaceSettings->value(SETTINGS_ADDRESS_KEY);
         
-        AddressManager::getInstance().handleLookupString(addressURL.toString());
+        QString addressString = addressVariant.isNull()
+            ? DEFAULT_HIFI_ADDRESS : addressVariant.toUrl().toString();
         
         unlockSettings();
+        
+        AddressManager::getInstance().handleLookupString(addressString);
     }
     
     qDebug() << "Loaded settings";
diff --git a/libraries/networking/src/AddressManager.h b/libraries/networking/src/AddressManager.h
index d6ecdc9fc6..cfdaaa7d41 100644
--- a/libraries/networking/src/AddressManager.h
+++ b/libraries/networking/src/AddressManager.h
@@ -19,7 +19,8 @@
 
 #include "AccountManager.h"
 
-static const QString HIFI_URL_SCHEME = "hifi";
+const QString HIFI_URL_SCHEME = "hifi";
+const QString DEFAULT_HIFI_ADDRESS = "hifi://sandbox";
 
 typedef const glm::vec3& (*PositionGetter)();
 typedef glm::quat (*OrientationGetter)();
diff --git a/libraries/networking/src/DomainHandler.h b/libraries/networking/src/DomainHandler.h
index 86c6e6bc57..a27a5d1dd8 100644
--- a/libraries/networking/src/DomainHandler.h
+++ b/libraries/networking/src/DomainHandler.h
@@ -22,8 +22,6 @@
 #include "HifiSockAddr.h"
 #include "NetworkPeer.h"
 
-const QString DEFAULT_DOMAIN_HOSTNAME = "sandbox.highfidelity.io";
-
 const unsigned short DEFAULT_DOMAIN_SERVER_PORT = 40102;
 const unsigned short DEFAULT_DOMAIN_SERVER_DTLS_PORT = 40103;
 const quint16 DOMAIN_SERVER_HTTP_PORT = 40100;