mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 15:09:24 +02:00
don't use clipboard when loading serverless domains
This commit is contained in:
parent
b18993e09f
commit
9ee65ab474
1 changed files with 10 additions and 4 deletions
|
@ -3113,7 +3113,6 @@ void Application::loadServerlessDomain(QUrl domainURL) {
|
||||||
}
|
}
|
||||||
|
|
||||||
clearDomainOctreeDetails();
|
clearDomainOctreeDetails();
|
||||||
_entityClipboard->eraseAllOctreeElements();
|
|
||||||
|
|
||||||
if (domainURL.isEmpty()) {
|
if (domainURL.isEmpty()) {
|
||||||
return;
|
return;
|
||||||
|
@ -3131,10 +3130,17 @@ void Application::loadServerlessDomain(QUrl domainURL) {
|
||||||
permissions.setAll(true);
|
permissions.setAll(true);
|
||||||
DependencyManager::get<NodeList>()->setPermissions(permissions);
|
DependencyManager::get<NodeList>()->setPermissions(permissions);
|
||||||
|
|
||||||
getEntities()->getTree()->eraseAllOctreeElements();
|
EntityTreePointer tmpTree(new EntityTree());
|
||||||
if (importEntities(domainURL.toString())) {
|
tmpTree->setIsServerlessMode(true);
|
||||||
pasteEntities(0.0f, 0.0f, 0.0f);
|
tmpTree->createRootElement();
|
||||||
|
auto myAvatar = getMyAvatar();
|
||||||
|
tmpTree->setMyAvatar(myAvatar);
|
||||||
|
bool success = tmpTree->readFromURL(domainURL.toString());
|
||||||
|
if (success) {
|
||||||
|
tmpTree->reaverageOctreeElements();
|
||||||
|
tmpTree->sendEntities(&_entityEditSender, getEntities()->getTree(), 0, 0, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
_fullSceneReceivedCounter++;
|
_fullSceneReceivedCounter++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue