Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-19 12:24:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

save avatar-entities which are created while using a serverless domain

Browse source
This commit is contained in:
Seth Alves 2018-02-23 16:03:08 -08:00
parent 3be1988260
commit 77febe0aab
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/Application.cpp
View file

@ -3061,7 +3061,9 @@ void Application::loadServerlessDomain(QUrl domainURL) {
return;
}
getMyAvatar()->setSessionUUID(QUuid::createUuid());
QUuid serverlessSessionID = QUuid::createUuid();
getMyAvatar()->setSessionUUID(serverlessSessionID);
DependencyManager::get<NodeList>()->setSessionUUID(serverlessSessionID);
auto addressManager = DependencyManager::get<AddressManager>();
addressManager->handleLookupString(DOMAIN_SPAWNING_POINT);

8
libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
View file

@ -219,8 +219,10 @@ void Avatar::updateAvatarEntities() {
return;
}
if (getID() == QUuid() || getID() == AVATAR_SELF_ID) {
return; // wait until MyAvatar gets an ID before doing this.
if (getID() == QUuid() ||
getID() == AVATAR_SELF_ID ||
DependencyManager::get<NodeList>()->getSessionUUID() == QUuid()) {
return; // wait until MyAvatar and this Node gets an ID before doing this.
}
auto treeRenderer = DependencyManager::get<EntityTreeRenderer>();
@ -1789,4 +1791,4 @@ void Avatar::processMaterials() {
material.pop();
}
}
}
}