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

Merge pull request #26 from druiz17/serverless-domains

Browse source 
Serverless domains
This commit is contained in:
Seth Alves 2018-03-07 13:40:55 -08:00 committed by GitHub
commit e583d3d104
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
interface/resources/start.json Normal file
View file

@ -0,0 +1,18 @@
{
"Entities": [
{
"type": "Box",
"dimensions": {
"x": 99.99999,
"y": 6.993421,
"z": 99.99999
},
"position" : {
"x": 0,
"y": -10,
"z": 0
}
}
],
"Version": 84
}

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

@ -58,7 +58,7 @@ void AddressBarDialog::loadHome() {
qDebug() << "Called LoadHome";
auto locationBookmarks = DependencyManager::get<LocationBookmarks>();
QString homeLocation = locationBookmarks->addressForBookmark(LocationBookmarks::HOME_BOOKMARK);
const QString DEFAULT_HOME_LOCATION = "localhost";
const QString DEFAULT_HOME_LOCATION = "file:///~/start/start.json";
if (homeLocation == "") {
homeLocation = DEFAULT_HOME_LOCATION;
}

2
libraries/entities/src/EntityTree.cpp
View file

@ -493,7 +493,7 @@ EntityItemPointer EntityTree::addEntity(const EntityItemID& entityID, const Enti
if (!properties.getClientOnly() && getIsClient() &&
!nodeList->getThisNodeCanRez() && !nodeList->getThisNodeCanRezTmp() &&
!nodeList->getThisNodeCanRezCertified() && !nodeList->getThisNodeCanRezTmpCertified()) {
!nodeList->getThisNodeCanRezCertified() && !nodeList->getThisNodeCanRezTmpCertified() && !_serverlessDomain) {
return nullptr;
}

2
libraries/shared/src/PathUtils.cpp
View file

@ -124,7 +124,7 @@ QUrl PathUtils::expandToLocalDataAbsolutePath(const QUrl& fileUrl) {
QUrl url = fileUrl;
QString path = fileUrl.path();
if (path.startsWith("/~/")) {
path.replace(0, 3, getAppLocalDataPath());
path.replace(0, 3, resourcesPath());
url = QUrl::fromLocalFile(path);
}
return url;