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

Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domains

Browse source
This commit is contained in:
Seth Alves 2018-02-21 13:46:41 -08:00
commit 15a3babda9
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/src/Application.cpp
View file

@ -893,6 +893,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
setProperty(hifi::properties::STEAM, (steamClient && steamClient->isRunning())); setProperty(hifi::properties::STEAM, (steamClient && steamClient->isRunning()));
setProperty(hifi::properties::CRASHED, _previousSessionCrashed); setProperty(hifi::properties::CRASHED, _previousSessionCrashed);
_entityClipboard->setIsServerlessMode(true);
{ {
const QString TEST_SCRIPT = "--testScript"; const QString TEST_SCRIPT = "--testScript";
const QString TRACE_FILE = "--traceFile"; const QString TRACE_FILE = "--traceFile";
@ -3057,6 +3059,9 @@ void Application::loadServerlessDomain(QUrl domainURL) {
addressManager->handleLookupString(DOMAIN_SPAWNING_POINT); addressManager->handleLookupString(DOMAIN_SPAWNING_POINT);
clearDomainOctreeDetails(); clearDomainOctreeDetails();
_entityClipboard->eraseAllOctreeElements();
getEntities()->getTree()->setIsServerlessMode(true);
getEntities()->getTree()->eraseAllOctreeElements();
if (importEntities(domainURL.toString())) { if (importEntities(domainURL.toString())) {
pasteEntities(0.0f, 0.0f, 0.0f); pasteEntities(0.0f, 0.0f, 0.0f);
} }

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

@ -303,7 +303,7 @@ bool AddressManager::handleUrl(const QUrl& lookupUrl, LookupTrigger trigger) {
// a path lookup clears the previous lookup since we don't expect to re-attempt it // a path lookup clears the previous lookup since we don't expect to re-attempt it
_previousLookup.clear(); _previousLookup.clear();
// if this is a relative path then handle it as a relative viewpoint // if this is a relative path then handle it as a relative viewpoint
handlePath(lookupUrl.path(), trigger, true); handlePath(lookupUrl.path(), trigger, false);
emit lookupResultsFinished(); emit lookupResultsFinished();
return true; return true;

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

@ -162,6 +162,9 @@ void DomainHandler::setSocketAndID(const QUrl& serverlessDomainURL,
if (serverlessDomainURL != _serverlessDomainURL) { if (serverlessDomainURL != _serverlessDomainURL) {
_serverlessDomainURL = serverlessDomainURL; _serverlessDomainURL = serverlessDomainURL;
if (_serverlessDomainURL != QUrl()) {
setIsConnected(true);
}
emit serverlessDomainChanged(""); emit serverlessDomainChanged("");
} }