History

more code review response

Seth Alves committed 8 years ago

Commit 507dfa51 parent bdd926f4 files · +12 −11Browse files

Showing the changes to interface/src/Application.cpp (1 of 4 files). Show all

Unified · Split

interface/src/Application.cpp+3−4
@@ -3109,10 +3109,7 @@ bool Application::importFromZIP(const QString& filePath) { · 3108 unmodified lines
3109}3109}
3110 3110
3111void Application::setServerlessDomain(bool serverlessDomain) {3111void Application::setServerlessDomain(bool serverlessDomain) {
3112 if (_serverlessDomain != serverlessDomain) {3112 getEntities()->getTree()->setIsServerlessMode(serverlessDomain);
3113 _serverlessDomain = serverlessDomain;
3114 getEntities()->getTree()->setIsServerlessMode(_serverlessDomain);
3115 }
3116}3113}
3117 3114
3118void Application::loadServerlessDomain(QUrl domainURL) {3115void Application::loadServerlessDomain(QUrl domainURL) {
@@ -3136,6 +3133,8 @@ void Application::loadServerlessDomain(QUrl domainURL) { · 17 unmodified lines
3136 permissions.setAll(true);3133 permissions.setAll(true);
3137 DependencyManager::get<NodeList>()->setPermissions(permissions);3134 DependencyManager::get<NodeList>()->setPermissions(permissions);
3138 3135
3136 // we can't import directly into the main tree because we would need to lock it, and
3137 // Octree::readFromURL calls loop.exec which can run code which will also attempt to lock the tree.
3139 EntityTreePointer tmpTree(new EntityTree());3138 EntityTreePointer tmpTree(new EntityTree());
3140 tmpTree->setIsServerlessMode(true);3139 tmpTree->setIsServerlessMode(true);
3141 tmpTree->createRootElement();3140 tmpTree->createRootElement();