From 9472d689c80bae18a1ebc2cea33ad85979d4d923 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Fri, 21 May 2021 11:51:30 +1200
Subject: [PATCH 1/3] Update to the latest Vircadia-Web master

---
 vircadia-web | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vircadia-web b/vircadia-web
index d2e383cab8..ac1f13a39c 160000
--- a/vircadia-web
+++ b/vircadia-web
@@ -1 +1 @@
-Subproject commit d2e383cab811018422433fe0d8f224e53e0506cf
+Subproject commit ac1f13a39c702ee54bf2cda8bc35e5d34f7f0756

From aa1c32ec53142f436529e9e079178c7a8aeec332 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Sat, 29 May 2021 09:25:15 +1200
Subject: [PATCH 2/3] Rename new domain server environment variable

---
 libraries/networking/src/DomainHandler.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/networking/src/DomainHandler.h b/libraries/networking/src/DomainHandler.h
index a8c316572a..05cf8f26d5 100644
--- a/libraries/networking/src/DomainHandler.h
+++ b/libraries/networking/src/DomainHandler.h
@@ -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
 

From 1dcee6cc1dbf5fb12f97796baf3c3a9979053285 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Wed, 2 Jun 2021 23:00:19 +1200
Subject: [PATCH 3/3] Conditionally include WebRTCSignalingServer.h

---
 domain-server/src/DomainServer.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/domain-server/src/DomainServer.h b/domain-server/src/DomainServer.h
index 29142505a8..2100a9ba14 100644
--- a/domain-server/src/DomainServer.h
+++ b/domain-server/src/DomainServer.h
@@ -28,7 +28,9 @@
 #include <HTTPSConnection.h>
 #include <LimitedNodeList.h>
 #include <shared/WebRTC.h>
+#if defined(WEBRTC_DATA_CHANNEL)
 #include <webrtc/WebRTCSignalingServer.h>
+#endif
 
 #include "AssetsBackupHandler.h"
 #include "DomainGatekeeper.h"