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

resolve conflicts on merge with clement/protocol

Browse source
This commit is contained in:
Stephen Birarda 2015-07-17 16:58:57 -07:00
commit 4661bd0075
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/networking/src/NetworkPeer.cpp
View file

@ -30,10 +30,9 @@ NetworkPeer::NetworkPeer(QObject* parent) :
_symmetricSocket(),
_activeSocket(NULL),
_wakeTimestamp(QDateTime::currentMSecsSinceEpoch()),
_lastHeardMicrostamp(usecTimestampNow()),
_connectionAttempts(0)
{
_lastHeardMicrostamp.store(usecTimestampNow());
}
NetworkPeer::NetworkPeer(const QUuid& uuid, const HifiSockAddr& publicSocket, const HifiSockAddr& localSocket, QObject* parent) :
@ -44,10 +43,9 @@ NetworkPeer::NetworkPeer(const QUuid& uuid, const HifiSockAddr& publicSocket, co
_symmetricSocket(),
_activeSocket(NULL),
_wakeTimestamp(QDateTime::currentMSecsSinceEpoch()),
_lastHeardMicrostamp(usecTimestampNow()),
_connectionAttempts(0)
{
_lastHeardMicrostamp.store(usecTimestampNow());
}
void NetworkPeer::setPublicSocket(const HifiSockAddr& publicSocket) {