Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-29 15:24:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

reverting files

Browse source
This commit is contained in:
Dante Ruiz 2018-03-22 09:20:27 -07:00
parent 14061a88d3
commit cea0f98aae
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
interface/src/Application.cpp
View file

@ -3053,9 +3053,15 @@ void Application::handleSandboxStatus(QNetworkReply* reply) {
#if !defined(Q_OS_ANDROID) #if !defined(Q_OS_ANDROID)
showHelp(); showHelp();
#endif #endif
qCDebug(interfaceapp) << "going to Entry."; if (sandboxIsRunning) {
DependencyManager::get<AddressManager>()->goToEntry(); qCDebug(interfaceapp) << "Home sandbox appears to be running, going to Home.";
sentTo = SENT_TO_ENTRY; DependencyManager::get<AddressManager>()->goToLocalSandbox();
sentTo = SENT_TO_SANDBOX;
} else {
qCDebug(interfaceapp) << "Home sandbox does not appear to be running, going to Entry.";
DependencyManager::get<AddressManager>()->goToEntry();
sentTo = SENT_TO_ENTRY;
}
firstRun.set(false); firstRun.set(false);
} else { } else {

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

@ -30,8 +30,11 @@
#include "UserActivityLogger.h" #include "UserActivityLogger.h"
#include "udt/PacketHeaders.h" #include "udt/PacketHeaders.h"
const QString DEFAULT_HIFI_ADDRESS = "file:///~/models.json"; #if USE_STABLE_GLOBAL_SERVICES
const QString DEFAULT_HIFI_ADDRESS = "hifi://welcome/hello";
#else
const QString DEFAULT_HIFI_ADDRESS = "hifi://dev-welcome/hello";
#endif
const QString ADDRESS_MANAGER_SETTINGS_GROUP = "AddressManager"; const QString ADDRESS_MANAGER_SETTINGS_GROUP = "AddressManager";
const QString SETTINGS_CURRENT_ADDRESS_KEY = "address"; const QString SETTINGS_CURRENT_ADDRESS_KEY = "address";