Showing the changes to interface/src/Application.cpp (1 of 4 files). Show all
Unified · Split
| @@ -3109,10 +3109,7 @@ bool Application::importFromZIP(const QString& filePath) { · 3108 unmodified lines | ||
| 3109 | 3109 | } |
| 3110 | 3110 | |
| 3111 | 3111 | void Application::setServerlessDomain(bool serverlessDomain) { |
| 3112 | − if (_serverlessDomain != serverlessDomain) { | |
| 3113 | − _serverlessDomain = serverlessDomain; | |
| 3114 | − getEntities()->getTree()->setIsServerlessMode(_serverlessDomain); | |
| 3115 | − } | |
| 3112 | + getEntities()->getTree()->setIsServerlessMode(serverlessDomain); | |
| 3116 | 3113 | } |
| 3117 | 3114 | |
| 3118 | 3115 | void Application::loadServerlessDomain(QUrl domainURL) { |
| @@ -3136,6 +3133,8 @@ void Application::loadServerlessDomain(QUrl domainURL) { · 17 unmodified lines | ||
| 3136 | 3133 | permissions.setAll(true); |
| 3137 | 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 | 3138 | EntityTreePointer tmpTree(new EntityTree()); |
| 3140 | 3139 | tmpTree->setIsServerlessMode(true); |
| 3141 | 3140 | tmpTree->createRootElement(); |