History

resolve conflicts on merge with clement/protocol

Stephen Birarda committed 11 years ago

Commit 24179812 parents caed7da 57d4e648 files · +26 −24Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+1−1
@@ -675,7 +675,7 @@ void ScriptEngine::run() { · 674 unmodified lines
675 audioPacket->writePrimitive(sequence);675 audioPacket->writePrimitive(sequence);
676 676
677 // send audio packet677 // send audio packet
678 nodeList->sendUnreliablePacket(audioPacket, node);678 nodeList->sendUnreliablePacket(*audioPacket, node);
679 }679 }
680 });680 });
681 }681 }