Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-25 00:27:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #8914 from birarda/master

Browse source 
Beta Release 24 - Includes up to Developer Release 5572
This commit is contained in:
Brad Hefta-Gaub 2016-10-25 18:10:38 -07:00 committed by GitHub
commit ac3d072915
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/networking/src/AddressManager.cpp
View file

@ -16,6 +16,7 @@
#include <QRegExp>
#include <QStringList>
#include <BuildInfo.h>
#include <GLMHelpers.h>
#include <NumericalConstants.h>
#include <SettingHandle.h>
@ -27,6 +28,11 @@
#include "UserActivityLogger.h"
#include "udt/PacketHeaders.h"
#if USE_STABLE_GLOBAL_SERVICES
const QString DEFAULT_HIFI_ADDRESS = "hifi://welcome";
#else
const QString DEFAULT_HIFI_ADDRESS = "hifi://dev-welcome";
#endif
const QString ADDRESS_MANAGER_SETTINGS_GROUP = "AddressManager";
const QString SETTINGS_CURRENT_ADDRESS_KEY = "address";

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

@ -24,11 +24,7 @@
const QString HIFI_URL_SCHEME = "hifi";
#if USE_STABLE_GLOBAL_SERVICES
const QString DEFAULT_HIFI_ADDRESS = "hifi://welcome";
#else
const QString DEFAULT_HIFI_ADDRESS = "hifi://dev-welcome";
#endif
extern const QString DEFAULT_HIFI_ADDRESS;
const QString SANDBOX_HIFI_ADDRESS = "hifi://localhost";
const QString INDEX_PATH = "/";