History

Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities

ZappoMan committed 12 years ago

Commit 32d5eb32 parents 1b1c386 a6f0c9b159 files · +4368 −3616Browse files

Showing the changes to assignment-client/src/Agent.cpp (1 of 159 files). Show all

Unified · Split

assignment-client/src/Agent.cpp+1−1
@@ -115,7 +115,7 @@ void Agent::readPendingDatagrams() { · 114 unmodified lines
115115 sourceNode->setLastHeardMicrostamp(usecTimestampNow());
116116
117117 QByteArray mutablePacket = receivedPacket;
118− ssize_t messageLength = mutablePacket.size();
118+ int messageLength = mutablePacket.size();
119119
120120 if (datagramPacketType == PacketTypeOctreeStats) {
121121

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t