Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-10 15:57:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #14831 from danteruiz/the-spot

Browse source 
Case 20942: Goto the spot on first launch (80.0/master)
This commit is contained in:
Jeff Clinton 2019-01-31 14:15:24 -08:00 committed by GitHub
commit 1239ca086d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/ui/AddressBarDialog.cpp
View file

@ -59,7 +59,7 @@ void AddressBarDialog::loadHome() {
auto locationBookmarks = DependencyManager::get<LocationBookmarks>();
QString homeLocation = locationBookmarks->addressForBookmark(LocationBookmarks::HOME_BOOKMARK);
if (homeLocation == "") {
homeLocation = DEFAULT_HIFI_ADDRESS;
homeLocation = DEFAULT_HOME_ADDRESS;
}
DependencyManager::get<AddressManager>()->handleLookupString(homeLocation);
}

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

@ -30,7 +30,8 @@
#include "UserActivityLogger.h"
#include "udt/PacketHeaders.h"
const QString DEFAULT_HIFI_ADDRESS = "file:///~/serverless/tutorial.json";
const QString DEFAULT_HIFI_ADDRESS = "hifi://welcome";
const QString DEFAULT_HOME_ADDRESS = "file:///~/serverless/tutorial.json";
const QString REDIRECT_HIFI_ADDRESS = "file:///~/serverless/redirect.json";
const QString ADDRESS_MANAGER_SETTINGS_GROUP = "AddressManager";
const QString SETTINGS_CURRENT_ADDRESS_KEY = "address";

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

@ -24,6 +24,7 @@
extern const QString DEFAULT_HIFI_ADDRESS;
extern const QString REDIRECT_HIFI_ADDRESS;
extern const QString DEFAULT_HOME_ADDRESS;
const QString SANDBOX_HIFI_ADDRESS = "hifi://localhost";
const QString INDEX_PATH = "/";