mirror of
https://github.com/overte-org/overte.git
synced 2025-08-08 10:17:40 +02:00
Merge branch 'master' of github.com:highfidelity/hifi into bug-whitespace-script-url
This commit is contained in:
commit
bcc15dd4ae
1 changed files with 2 additions and 2 deletions
|
@ -930,7 +930,7 @@ void NodeList::maybeSendIgnoreSetToNode(SharedNodePointer newNode) {
|
||||||
|
|
||||||
if (_personalMutedNodeIDs.size() > 0) {
|
if (_personalMutedNodeIDs.size() > 0) {
|
||||||
// setup a packet list so we can send the stream of ignore IDs
|
// 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
|
// Force the "enabled" flag in this packet to true
|
||||||
personalMutePacketList->writePrimitive(true);
|
personalMutePacketList->writePrimitive(true);
|
||||||
|
@ -957,7 +957,7 @@ void NodeList::maybeSendIgnoreSetToNode(SharedNodePointer newNode) {
|
||||||
|
|
||||||
if (_ignoredNodeIDs.size() > 0) {
|
if (_ignoredNodeIDs.size() > 0) {
|
||||||
// setup a packet list so we can send the stream of ignore IDs
|
// 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
|
// Force the "enabled" flag in this packet to true
|
||||||
ignorePacketList->writePrimitive(true);
|
ignorePacketList->writePrimitive(true);
|
||||||
|
|
Loading…
Reference in a new issue