From 37e16d2e6d9d7e2e2f6b6a362d3d1dd594ab75a5 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Wed, 21 Feb 2018 12:54:41 -0800
Subject: [PATCH] don't save up edit packets when loading a serverless domain

---
 interface/src/Application.cpp | 5 +++++
 1 file changed, 5 insertions(+)

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