mirror of
https://github.com/overte-org/overte.git
synced 2025-07-23 09:03:53 +02:00
fix another fading avatar
This commit is contained in:
parent
fd245b61ab
commit
475cf4d6f7
1 changed files with 2 additions and 2 deletions
|
@ -497,7 +497,7 @@ void AvatarManager::handleRemovedAvatar(const AvatarSharedPointer& removedAvatar
|
||||||
// it might not fire until after we create a new instance for the same remote avatar, which creates a race
|
// it might not fire until after we create a new instance for the same remote avatar, which creates a race
|
||||||
// on the creation of entities for that avatar instance and the deletion of entities for this instance
|
// on the creation of entities for that avatar instance and the deletion of entities for this instance
|
||||||
avatar->removeAvatarEntitiesFromTree();
|
avatar->removeAvatarEntitiesFromTree();
|
||||||
if (removalReason == KillAvatarReason::TheirAvatarEnteredYourBubble || removalReason == KillAvatarReason::NoReason) {
|
if (removalReason != KillAvatarReason::AvatarDisconnected) {
|
||||||
emit AvatarInputs::getInstance()->avatarEnteredIgnoreRadius(avatar->getSessionUUID());
|
emit AvatarInputs::getInstance()->avatarEnteredIgnoreRadius(avatar->getSessionUUID());
|
||||||
emit DependencyManager::get<UsersScriptingInterface>()->enteredIgnoreRadius();
|
emit DependencyManager::get<UsersScriptingInterface>()->enteredIgnoreRadius();
|
||||||
|
|
||||||
|
@ -509,7 +509,7 @@ void AvatarManager::handleRemovedAvatar(const AvatarSharedPointer& removedAvatar
|
||||||
render::Transaction transaction;
|
render::Transaction transaction;
|
||||||
avatar->removeFromScene(avatar, scene, transaction);
|
avatar->removeFromScene(avatar, scene, transaction);
|
||||||
scene->enqueueTransaction(transaction);
|
scene->enqueueTransaction(transaction);
|
||||||
} else if (removalReason == KillAvatarReason::AvatarDisconnected) {
|
} else {
|
||||||
// remove from node sets, if present
|
// remove from node sets, if present
|
||||||
DependencyManager::get<NodeList>()->removeFromIgnoreMuteSets(avatar->getSessionUUID());
|
DependencyManager::get<NodeList>()->removeFromIgnoreMuteSets(avatar->getSessionUUID());
|
||||||
DependencyManager::get<UsersScriptingInterface>()->avatarDisconnected(avatar->getSessionUUID());
|
DependencyManager::get<UsersScriptingInterface>()->avatarDisconnected(avatar->getSessionUUID());
|
||||||
|
|
Loading…
Reference in a new issue