Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 12:54:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed incorrect removal of ALL avatar fade events. Fade out should now work again when avatar leaves domain

Browse source
This commit is contained in:
Olivier Prat 2017-07-18 14:46:49 +02:00
parent 2bba6aa816
commit 9130c51319
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/avatar/AvatarManager.cpp
View file

@ -319,9 +319,9 @@ void AvatarManager::handleRemovedAvatar(const AvatarSharedPointer& removedAvatar
// 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());
avatar->fadeOut(qApp->getMain3DScene(), removalReason);
} }
_avatarsToFade.push_back(removedAvatar); _avatarsToFade.push_back(removedAvatar);
avatar->fadeOut(qApp->getMain3DScene(), removalReason);
} }
void AvatarManager::clearOtherAvatars() { void AvatarManager::clearOtherAvatars() {

2
libraries/avatars/src/AvatarHashMap.cpp
View file

@ -173,7 +173,7 @@ void AvatarHashMap::processKillAvatar(QSharedPointer<ReceivedMessage> message, S
void AvatarHashMap::removeAvatar(const QUuid& sessionUUID, KillAvatarReason removalReason) { void AvatarHashMap::removeAvatar(const QUuid& sessionUUID, KillAvatarReason removalReason) {
QWriteLocker locker(&_hashLock); QWriteLocker locker(&_hashLock);
AvatarSharedPointer removedAvatar = _avatarHash.take(sessionUUID); auto removedAvatar = _avatarHash.take(sessionUUID);
if (removedAvatar) { if (removedAvatar) {
handleRemovedAvatar(removedAvatar, removalReason); handleRemovedAvatar(removedAvatar, removalReason);