Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 15:09:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

don't use clipboard when loading serverless domains

Browse source
This commit is contained in:
Seth Alves 2018-03-01 13:31:43 -08:00
parent b18993e09f
commit 9ee65ab474
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
interface/src/Application.cpp
View file

@ -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++;
} }