mirror of
https://github.com/overte-org/overte.git
synced 2025-08-10 03:19:24 +02:00
Merge remote-tracking branch 'upstream/webapp' into dev/webrtc-datachannel
# Conflicts: # domain-server/src/DomainServer.h
This commit is contained in:
commit
2402a5e333
3 changed files with 5 additions and 3 deletions
|
@ -28,8 +28,10 @@
|
||||||
#include <HTTPSConnection.h>
|
#include <HTTPSConnection.h>
|
||||||
#include <LimitedNodeList.h>
|
#include <LimitedNodeList.h>
|
||||||
#include <shared/WebRTC.h>
|
#include <shared/WebRTC.h>
|
||||||
|
#if defined(WEBRTC_DATA_CHANNEL)
|
||||||
#include <webrtc/WebRTCDataChannels.h>
|
#include <webrtc/WebRTCDataChannels.h>
|
||||||
#include <webrtc/WebRTCSignalingServer.h>
|
#include <webrtc/WebRTCSignalingServer.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "AssetsBackupHandler.h"
|
#include "AssetsBackupHandler.h"
|
||||||
#include "DomainGatekeeper.h"
|
#include "DomainGatekeeper.h"
|
||||||
|
|
|
@ -44,9 +44,9 @@ const unsigned short DEFAULT_DOMAIN_SERVER_PORT =
|
||||||
|
|
||||||
const unsigned short DEFAULT_DOMAIN_SERVER_WS_PORT =
|
const unsigned short DEFAULT_DOMAIN_SERVER_WS_PORT =
|
||||||
QProcessEnvironment::systemEnvironment()
|
QProcessEnvironment::systemEnvironment()
|
||||||
.contains("HIFI_DOMAIN_SERVER_WS_PORT")
|
.contains("VIRCADIA_DOMAIN_SERVER_WS_PORT")
|
||||||
? QProcessEnvironment::systemEnvironment()
|
? QProcessEnvironment::systemEnvironment()
|
||||||
.value("HIFI_DOMAIN_SERVER_WS_PORT")
|
.value("VIRCADIA_DOMAIN_SERVER_WS_PORT")
|
||||||
.toUShort()
|
.toUShort()
|
||||||
: 40102; // TCP
|
: 40102; // TCP
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit d2e383cab811018422433fe0d8f224e53e0506cf
|
Subproject commit ac1f13a39c702ee54bf2cda8bc35e5d34f7f0756
|
Loading…
Reference in a new issue