History

immediately fade out ignored avatars

Stephen Birarda committed 10 years ago

Commit 6b6513d1 parent d5af3236 files · +17 −9Browse files

Showing the changes to libraries/script-engine/src/UsersScriptingInterface.cpp (1 of 6 files). Show all

Unified · Split

libraries/script-engine/src/UsersScriptingInterface.cpp+2−3
@@ -20,7 +20,7 @@ void UsersScriptingInterface::ignore(const QUuid& nodeID) { · 19 unmodified lines
2020 // enumerate the nodes to send a reliable ignore packet to each that can leverage it
2121 auto nodeList = DependencyManager::get<NodeList>();
2222
23− if (nodeList->getSessionUUID() != nodeID) {
23+ if (!nodeID.isNull() && nodeList->getSessionUUID() != nodeID) {
2424 nodeList->eachMatchingNode([&nodeID](const SharedNodePointer& node)->bool {
2525 if (node->getType() == NodeType::AudioMixer || node->getType() == NodeType::AvatarMixer) {
2626 return true;
@@ -42,7 +42,6 @@ void UsersScriptingInterface::ignore(const QUuid& nodeID) { · 15 unmodified lines
4242
4343 emit ignoredNode(nodeID);
4444 } else {
45− qWarning() << "UsersScriptingInterface was asked to ignore a node ID which matches the current session ID, "
46− << "but self-ignore has no meaning.";
45+ qWarning() << "UsersScriptingInterface::ignore called with an invalid ID or an ID which matches the current session ID.";
4746 }
4847 }