Merge branch 'master' of github.com:highfidelity/hifi into bug-whitespace-script-url

This commit is contained in:
Dante Ruiz 2017-07-18 17:59:56 +01:00
commit bcc15dd4ae

View file

@ -930,7 +930,7 @@ void NodeList::maybeSendIgnoreSetToNode(SharedNodePointer newNode) {
if (_personalMutedNodeIDs.size() > 0) {
// setup a packet list so we can send the stream of ignore IDs
auto personalMutePacketList = NLPacketList::create(PacketType::NodeIgnoreRequest, QByteArray(), true);
auto personalMutePacketList = NLPacketList::create(PacketType::NodeIgnoreRequest, QByteArray(), true, true);
// Force the "enabled" flag in this packet to true
personalMutePacketList->writePrimitive(true);
@ -957,7 +957,7 @@ void NodeList::maybeSendIgnoreSetToNode(SharedNodePointer newNode) {
if (_ignoredNodeIDs.size() > 0) {
// setup a packet list so we can send the stream of ignore IDs
auto ignorePacketList = NLPacketList::create(PacketType::NodeIgnoreRequest, QByteArray(), true);
auto ignorePacketList = NLPacketList::create(PacketType::NodeIgnoreRequest, QByteArray(), true, true);
// Force the "enabled" flag in this packet to true
ignorePacketList->writePrimitive(true);