History

resolve conflicts on merge with birarda/protocol

Stephen Birarda committed 11 years ago

Commit fd43c482 parents 1c3543f 0f77ab8408 files · +17599 −10038Browse files

Showing the changes to libraries/networking/src/DomainHandler.cpp (1 of 408 files). Show all

Unified · Split

libraries/networking/src/DomainHandler.cpp+3−1
@@ -29,6 +29,7 @@ DomainHandler::DomainHandler(QObject* parent) : · 28 unmodified lines
29 _uuid(),29 _uuid(),
30 _sockAddr(HifiSockAddr(QHostAddress::Null, DEFAULT_DOMAIN_SERVER_PORT)),30 _sockAddr(HifiSockAddr(QHostAddress::Null, DEFAULT_DOMAIN_SERVER_PORT)),
31 _assignmentUUID(),31 _assignmentUUID(),
32 _connectionToken(),
32 _iceDomainID(),33 _iceDomainID(),
33 _iceClientID(),34 _iceClientID(),
34 _iceServerSockAddr(),35 _iceServerSockAddr(),
@@ -45,7 +46,8 @@ DomainHandler::DomainHandler(QObject* parent) : · 10 unmodified lines
45 46
46void DomainHandler::clearConnectionInfo() {47void DomainHandler::clearConnectionInfo() {
47 _uuid = QUuid();48 _uuid = QUuid();
48 49 _connectionToken = QUuid();
50
49 _icePeer.reset();51 _icePeer.reset();
50 52
51 if (requiresICE()) {53 if (requiresICE()) {

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