Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 16:36:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3822 from birarda/master

Browse source 
restore default domain for clean app launch
This commit is contained in:
Brad Hefta-Gaub 2014-11-18 15:48:27 -08:00
commit 02b8ef2a05
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
interface/src/Application.cpp
View file

@ -1926,11 +1926,14 @@ void Application::init() {
// check if we have a URL in settings to load to jump back to // 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 // we load this separate from the other settings so we don't double lookup a URL
QSettings* interfaceSettings = lockSettings(); 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(); unlockSettings();
AddressManager::getInstance().handleLookupString(addressString);
} }
qDebug() << "Loaded settings"; qDebug() << "Loaded settings";

3
libraries/networking/src/AddressManager.h
View file

@ -19,7 +19,8 @@
#include "AccountManager.h" #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 const glm::vec3& (*PositionGetter)();
typedef glm::quat (*OrientationGetter)(); typedef glm::quat (*OrientationGetter)();

2
libraries/networking/src/DomainHandler.h
View file

@ -22,8 +22,6 @@
#include "HifiSockAddr.h" #include "HifiSockAddr.h"
#include "NetworkPeer.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_PORT = 40102;
const unsigned short DEFAULT_DOMAIN_SERVER_DTLS_PORT = 40103; const unsigned short DEFAULT_DOMAIN_SERVER_DTLS_PORT = 40103;
const quint16 DOMAIN_SERVER_HTTP_PORT = 40100; const quint16 DOMAIN_SERVER_HTTP_PORT = 40100;