Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/webapp' into dev/webrtc-datachannel

Browse source 
# Conflicts:
#	domain-server/src/DomainServer.h
This commit is contained in:
David Rowe 2021-06-05 14:27:18 +12:00
commit 2402a5e333
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
domain-server/src/DomainServer.h
View file

@ -28,8 +28,10 @@
#include <HTTPSConnection.h>
#include <LimitedNodeList.h>
#include <shared/WebRTC.h>
#if defined(WEBRTC_DATA_CHANNEL)
#include <webrtc/WebRTCDataChannels.h>
#include <webrtc/WebRTCSignalingServer.h>
#endif
#include "AssetsBackupHandler.h"
#include "DomainGatekeeper.h"

4
libraries/networking/src/DomainHandler.h
View file

@ -44,9 +44,9 @@ const unsigned short DEFAULT_DOMAIN_SERVER_PORT =
const unsigned short DEFAULT_DOMAIN_SERVER_WS_PORT =
QProcessEnvironment::systemEnvironment()
.contains("HIFI_DOMAIN_SERVER_WS_PORT")
.contains("VIRCADIA_DOMAIN_SERVER_WS_PORT")
? QProcessEnvironment::systemEnvironment()
.value("HIFI_DOMAIN_SERVER_WS_PORT")
.value("VIRCADIA_DOMAIN_SERVER_WS_PORT")
.toUShort()
: 40102; // TCP

2
vircadia-web

@ -1 +1 @@
Subproject commit d2e383cab811018422433fe0d8f224e53e0506cf
Subproject commit ac1f13a39c702ee54bf2cda8bc35e5d34f7f0756