don't save up edit packets when loading a serverless domain

This commit is contained in:
Seth Alves 2018-02-21 12:54:41 -08:00
parent c5d6f0e10f
commit 37e16d2e6d

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);
} }