1berry/overte
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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) {
// remove from node sets, if present
DependencyManager::get<NodeList>()->maintainIgnoreMuteSets(avatar->getSessionUUID());
DependencyManager::get<NodeList>()->removeFromIgnoreMuteSets(avatar->getSessionUUID());
DependencyManager::get<UsersScriptingInterface>()->avatarDisconnected(avatar->getSessionUUID());
}
_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::maintainIgnoreMuteSets(const QUuid& nodeID) {
void NodeList::removeFromIgnoreMuteSets(const QUuid& nodeID) {
// don't remove yourself, or nobody
if (!nodeID.isNull() && _sessionUUID != nodeID) {
QWriteLocker ignoredSetLocker{ &_ignoredSetLock };

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

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

1
scripts/system/pal.js
View File

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