Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-18 08:36:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'avatar-interaction' of ssh://github.com/AndrewMeadows/hifi into avatar-interaction

Browse source
This commit is contained in:
Andrew Meadows 2014-02-10 17:14:43 -08:00
commit 728f3c7b78
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/metavoxels/src/DatagramSequencer.cpp
View file

@ -181,7 +181,7 @@ void DatagramSequencer::receivedDatagram(const QByteArray& datagram) {
for (quint32 i = 0; i < highPriorityMessageCount; i++) {
QVariant data;
_inputStream >> data;
if (i >= _receivedHighPriorityMessages) {
if ((int)i >= _receivedHighPriorityMessages) {
handleHighPriorityMessage(data);
}
}

3
tests/metavoxels/CMakeLists.txt
View file

@ -29,4 +29,7 @@ include(${MACRO_DIR}/LinkHifiLibrary.cmake)
link_hifi_library(metavoxels ${TARGET_NAME} ${ROOT_DIR})
link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR})
IF (WIN32)
target_link_libraries(${TARGET_NAME} Winmm Ws2_32)
ENDIF(WIN32)