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

Merge branch 'atp' of https://github.com/birarda/hifi into protocol

Browse source
This commit is contained in:
Atlante45 2015-07-16 13:42:08 -07:00
commit 246b39a18a
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/networking/src/AddressManager.cpp
View file

@ -548,7 +548,13 @@ void AddressManager::setHost(const QString& host, LookupTrigger trigger) {
void AddressManager::setDomainInfo(const QString& hostname, quint16 port, LookupTrigger trigger) {
setHost(hostname, trigger);
QString domainHostString = hostname;
if (port != DEFAULT_DOMAIN_SERVER_PORT) {
domainHostString.append(QString(":%1").arg(port));
}
setHost(domainHostString, trigger);
_rootPlaceID = QUuid();

1
libraries/networking/src/udt/PacketHeaders.cpp
View file

@ -135,7 +135,6 @@ QString nameForPacketType(PacketType::Value packetType) {
PACKET_TYPE_NAME_LOOKUP(DomainConnectionDenied);
PACKET_TYPE_NAME_LOOKUP(MuteEnvironment);
PACKET_TYPE_NAME_LOOKUP(AudioStreamStats);
PACKET_TYPE_NAME_LOOKUP(DataServerConfirm);
PACKET_TYPE_NAME_LOOKUP(OctreeStats);
PACKET_TYPE_NAME_LOOKUP(Jurisdiction);
PACKET_TYPE_NAME_LOOKUP(JurisdictionRequest);

2
libraries/networking/src/udt/PacketHeaders.h
View file

@ -48,7 +48,7 @@ namespace PacketType {
DomainConnectionDenied,
MuteEnvironment,
AudioStreamStats,
DataServerConfirm, // 20
UNUSED, // 20
DomainServerPathQuery,
DomainServerPathResponse,
DomainServerAddedNode,