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

Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization

Browse source
This commit is contained in:
ZappoMan 2013-05-06 13:47:13 -07:00
commit 4f7adf7a05
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
domain-server/src/main.cpp
View file

@ -100,7 +100,7 @@ int main(int argc, const char * argv[])
std::map<char, Agent *> newestSoloAgents; std::map<char, Agent *> newestSoloAgents;
agentType = packetData[1]; agentType = packetData[1];
unpackSocket(&packetData[2], (sockaddr*) &agentLocalAddress); unpackSocket(packetData + 2, (sockaddr*) &agentLocalAddress);
// check the agent public address // check the agent public address
// if it matches our local address we're on the same box // if it matches our local address we're on the same box
@ -125,7 +125,7 @@ int main(int argc, const char * argv[])
refreshedAgent->setWakeMicrostamp(usecTimestampNow()); refreshedAgent->setWakeMicrostamp(usecTimestampNow());
} }
currentBufferPos = broadcastPacket + 2; currentBufferPos = broadcastPacket + 1;
startPointer = currentBufferPos; startPointer = currentBufferPos;
for (AgentList::iterator agent = agentList->begin(); agent != agentList->end(); agent++) { for (AgentList::iterator agent = agentList->begin(); agent != agentList->end(); agent++) {

2
interface/src/SerialInterface.cpp
View file

@ -34,7 +34,9 @@ const int GRAVITY_SAMPLES = 200; // Use the first samples to
const bool USING_INVENSENSE_MPU9150 = 1; const bool USING_INVENSENSE_MPU9150 = 1;
SerialInterface::~SerialInterface() { SerialInterface::~SerialInterface() {
#ifdef __APPLE__
close(_serialDescriptor); close(_serialDescriptor);
#endif
} }
void SerialInterface::pair() { void SerialInterface::pair() {