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

CR feedback

Browse source
This commit is contained in:
David Kelly 2017-01-17 09:53:04 -08:00
parent 6c07a9aece
commit 2460e89a57
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -263,7 +263,7 @@ void AvatarManager::handleRemovedAvatar(const AvatarSharedPointer& removedAvatar
} }
if (removalReason == KillAvatarReason::AvatarDisconnected) { if (removalReason == KillAvatarReason::AvatarDisconnected) {
// remove from node sets, if present // remove from node sets, if present
DependencyManager::get<NodeList>()->maintainIgnoreMuteSets(avatar->getSessionUUID()); DependencyManager::get<NodeList>()->removeFromIgnoreMuteSets(avatar->getSessionUUID());
DependencyManager::get<UsersScriptingInterface>()->avatarDisconnected(avatar->getSessionUUID()); DependencyManager::get<UsersScriptingInterface>()->avatarDisconnected(avatar->getSessionUUID());
} }
_avatarFades.push_back(removedAvatar); _avatarFades.push_back(removedAvatar);

3
libraries/networking/src/NodeList.cpp
View file

@ -847,8 +847,7 @@ void NodeList::ignoreNodeBySessionID(const QUuid& nodeID, bool ignoreEnabled) {
} }
} }
// removes this UUID from ignore and mute lists. void NodeList::removeFromIgnoreMuteSets(const QUuid& nodeID) {
void NodeList::maintainIgnoreMuteSets(const QUuid& nodeID) {
// don't remove yourself, or nobody // don't remove yourself, or nobody
if (!nodeID.isNull() && _sessionUUID != nodeID) { if (!nodeID.isNull() && _sessionUUID != nodeID) {
QWriteLocker ignoredSetLocker{ &_ignoredSetLock }; QWriteLocker ignoredSetLocker{ &_ignoredSetLock };

2
libraries/networking/src/NodeList.h
View file

@ -90,7 +90,7 @@ public:
bool getRequestsDomainListData() { return _requestsDomainListData; } bool getRequestsDomainListData() { return _requestsDomainListData; }
void setRequestsDomainListData(bool isRequesting); void setRequestsDomainListData(bool isRequesting);
void maintainIgnoreMuteSets(const QUuid& nodeID); void removeFromIgnoreMuteSets(const QUuid& nodeID);
public slots: public slots:
void reset(); void reset();

1
scripts/system/pal.js
View file

@ -620,6 +620,7 @@ Script.scriptEnding.connect(function () {
Window.domainConnectionRefused.disconnect(clearLocalQMLDataAndClosePAL); Window.domainConnectionRefused.disconnect(clearLocalQMLDataAndClosePAL);
Messages.unsubscribe(CHANNEL); Messages.unsubscribe(CHANNEL);
Messages.messageReceived.disconnect(receiveMessage); Messages.messageReceived.disconnect(receiveMessage);
Users.avatarDisconnected.disconnect(avatarDisconnected);
off(); off();
}); });