Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-22 19:13:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'atp' of https://github.com/birarda/hifi into protocol

Browse source
This commit is contained in:
Atlante45 2015-07-09 13:22:45 -07:00
commit a9cfcf241d
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/networking/src/SentPacketHistory.cpp
View file

@ -48,10 +48,6 @@ const NLPacket* SentPacketHistory::getPacket(uint16_t sequenceNumber) const {
if (seqDiff < 0) {
seqDiff += UINT16_RANGE;
}
auto packet = _sentPackets.get(seqDiff);
if (packet) {
return packet->get();
} else {
return nullptr;
}
return _sentPackets.get(seqDiff)->get();
}

2
libraries/script-engine/src/ScriptEngine.cpp
View file

@ -675,7 +675,7 @@ void ScriptEngine::run() {
audioPacket->writePrimitive(sequence);
// send audio packet
nodeList->sendPacket(std::move(audioPacket), node);
nodeList->sendUnreliablePacket(audioPacket, node);
}
});
}