From 2d4da7ba714004415fff784294b5bbb5338dc5af Mon Sep 17 00:00:00 2001
From: Kalila L <somnilibertas@gmail.com>
Date: Mon, 21 Jun 2021 13:22:48 -0400
Subject: [PATCH 01/27] Add disable domain port auto discovery by assignment
 client option.

---
 assignment-client/src/AssignmentClient.cpp    | 24 ++++++++++++-------
 assignment-client/src/AssignmentClient.h      |  7 +++---
 assignment-client/src/AssignmentClientApp.cpp | 19 +++++++++++----
 assignment-client/src/AssignmentClientApp.h   |  2 ++
 .../src/AssignmentClientMonitor.cpp           | 12 +++++++---
 .../src/AssignmentClientMonitor.h             |  6 +++--
 libraries/networking/src/NodeList.cpp         | 18 +++++++-------
 libraries/networking/src/NodeList.h           |  5 +++-
 8 files changed, 62 insertions(+), 31 deletions(-)

diff --git a/assignment-client/src/AssignmentClient.cpp b/assignment-client/src/AssignmentClient.cpp
index adc7f5e3c5..8e44cdd157 100644
--- a/assignment-client/src/AssignmentClient.cpp
+++ b/assignment-client/src/AssignmentClient.cpp
@@ -44,7 +44,8 @@ const long long ASSIGNMENT_REQUEST_INTERVAL_MSECS = 1 * 1000;
 
 AssignmentClient::AssignmentClient(Assignment::Type requestAssignmentType, QString assignmentPool,
                                    quint16 listenPort, QUuid walletUUID, QString assignmentServerHostname,
-                                   quint16 assignmentServerPort, quint16 assignmentMonitorPort) :
+                                   quint16 assignmentServerPort, quint16 assignmentMonitorPort,
+                                   bool disableDomainPortAutoDiscovery) :
     _assignmentServerHostname(DEFAULT_ASSIGNMENT_SERVER_HOSTNAME)
 {
     LogUtils::init();
@@ -89,6 +90,13 @@ AssignmentClient::AssignmentClient(Assignment::Type requestAssignmentType, QStri
     _assignmentServerSocket.setObjectName("AssignmentServer");
     nodeList->setAssignmentServerSocket(_assignmentServerSocket);
 
+    if (disableDomainPortAutoDiscovery == true) {
+        _disableDomainPortAutoDiscovery = disableDomainPortAutoDiscovery;
+        qCDebug(assignment_client) << "Disabling domain port auto discovery by the assignment client due to parsed command line parameter.";
+    }
+
+    nodeList->setDomainPortAutoDiscovery(_disableDomainPortAutoDiscovery);
+
     qCDebug(assignment_client) << "Assignment server socket is" << _assignmentServerSocket;
 
     // call a timer function every ASSIGNMENT_REQUEST_INTERVAL_MSECS to ask for assignment, if required
@@ -164,7 +172,7 @@ void AssignmentClient::setUpStatusToMonitor() {
 void AssignmentClient::sendStatusPacketToACM() {
     // tell the assignment client monitor what this assignment client is doing (if anything)
     auto nodeList = DependencyManager::get<NodeList>();
-    
+
     quint8 assignmentType = Assignment::Type::AllTypes;
 
     if (_currentAssignment) {
@@ -175,7 +183,7 @@ void AssignmentClient::sendStatusPacketToACM() {
 
     statusPacket->write(_childAssignmentUUID.toRfc4122());
     statusPacket->writePrimitive(assignmentType);
-    
+
     nodeList->sendPacket(std::move(statusPacket), _assignmentClientMonitorSocket);
 }
 
@@ -185,7 +193,7 @@ void AssignmentClient::sendAssignmentRequest() {
 
         auto nodeList = DependencyManager::get<NodeList>();
 
-        if (_assignmentServerHostname == "localhost") {
+        if (_assignmentServerHostname == "localhost" && _disableDomainPortAutoDiscovery == false) {
             // we want to check again for the local domain-server port in case the DS has restarted
             quint16 localAssignmentServerPort;
             if (nodeList->getLocalServerPortFromSharedMemory(DOMAIN_SERVER_LOCAL_PORT_SMEM_KEY, localAssignmentServerPort)) {
@@ -270,10 +278,10 @@ void AssignmentClient::handleCreateAssignmentPacket(QSharedPointer<ReceivedMessa
 
 void AssignmentClient::handleStopNodePacket(QSharedPointer<ReceivedMessage> message) {
     const HifiSockAddr& senderSockAddr = message->getSenderSockAddr();
-    
+
     if (senderSockAddr.getAddress() == QHostAddress::LocalHost ||
         senderSockAddr.getAddress() == QHostAddress::LocalHostIPv6) {
-        
+
         qCDebug(assignment_client) << "AssignmentClientMonitor at" << senderSockAddr << "requested stop via PacketType::StopNode.";
         QCoreApplication::quit();
     } else {
@@ -307,7 +315,7 @@ void AssignmentClient::handleAuthenticationRequest() {
 
 void AssignmentClient::assignmentCompleted() {
     crash::annotations::setShutdownState(true);
-    
+
     // we expect that to be here the previous assignment has completely cleaned up
     assert(_currentAssignment.isNull());
 
@@ -328,6 +336,6 @@ void AssignmentClient::assignmentCompleted() {
     nodeList->setOwnerType(NodeType::Unassigned);
     nodeList->reset("Assignment completed");
     nodeList->resetNodeInterestSet();
-    
+
     _isAssigned = false;
 }
diff --git a/assignment-client/src/AssignmentClient.h b/assignment-client/src/AssignmentClient.h
index 28464bc222..d40f0964d1 100644
--- a/assignment-client/src/AssignmentClient.h
+++ b/assignment-client/src/AssignmentClient.h
@@ -23,9 +23,9 @@ class AssignmentClient : public QObject {
     Q_OBJECT
 public:
     AssignmentClient(Assignment::Type requestAssignmentType, QString assignmentPool,
-                     quint16 listenPort,
-                     QUuid walletUUID, QString assignmentServerHostname, quint16 assignmentServerPort,
-                     quint16 assignmentMonitorPort);
+                     quint16 listenPort, QUuid walletUUID, QString assignmentServerHostname,
+                     quint16 assignmentServerPort, quint16 assignmentMonitorPort,
+                     bool disableDomainPortAutoDiscovery);
     ~AssignmentClient();
 
 private slots:
@@ -53,6 +53,7 @@ private:
     QTimer _requestTimer; // timer for requesting and assignment
     QTimer _statsTimerACM; // timer for sending stats to assignment client monitor
     QUuid _childAssignmentUUID = QUuid::createUuid();
+    bool _disableDomainPortAutoDiscovery { false };
 
  protected:
     HifiSockAddr _assignmentClientMonitorSocket;
diff --git a/assignment-client/src/AssignmentClientApp.cpp b/assignment-client/src/AssignmentClientApp.cpp
index 1dd050fcb9..49674f5728 100644
--- a/assignment-client/src/AssignmentClientApp.cpp
+++ b/assignment-client/src/AssignmentClientApp.cpp
@@ -4,6 +4,7 @@
 //
 //  Created by Seth Alves on 2/19/15.
 //  Copyright 2015 High Fidelity, Inc.
+//  Copyright 2021 Vircadia contributors.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -44,7 +45,7 @@ AssignmentClientApp::AssignmentClientApp(int argc, char* argv[]) :
 
     // parse command-line
     QCommandLineParser parser;
-    parser.setApplicationDescription("High Fidelity Assignment Client");
+    parser.setApplicationDescription("Vircadia Assignment Client");
     const QCommandLineOption helpOption = parser.addHelpOption();
     const QCommandLineOption versionOption = parser.addVersionOption();
 
@@ -54,8 +55,8 @@ AssignmentClientApp::AssignmentClientApp(int argc, char* argv[]) :
         type = static_cast<Assignment::Type>(static_cast<int>(type) + 1)) {
         typeDescription.append(QStringLiteral("\n%1 | %2").arg(QString::number(type), Assignment::typeToString(type)));
     }
-    const QCommandLineOption clientTypeOption(ASSIGNMENT_TYPE_OVERRIDE_OPTION, typeDescription, "type");
 
+    const QCommandLineOption clientTypeOption(ASSIGNMENT_TYPE_OVERRIDE_OPTION, typeDescription, "type");
     parser.addOption(clientTypeOption);
 
     const QCommandLineOption poolOption(ASSIGNMENT_POOL_OPTION, "set assignment pool", "pool-name");
@@ -99,6 +100,9 @@ AssignmentClientApp::AssignmentClientApp(int argc, char* argv[]) :
     const QCommandLineOption logDirectoryOption(ASSIGNMENT_LOG_DIRECTORY, "directory to store logs", "log-directory");
     parser.addOption(logDirectoryOption);
 
+    const QCommandLineOption disableDomainPortAutoDiscoveryOption(ASSIGNMENT_DISABLE_DOMAIN_AUTO_PORT_DISCOVERY, "disable automatic discovery of the domain server port");
+    parser.addOption(disableDomainPortAutoDiscoveryOption);
+
     const QCommandLineOption parentPIDOption(PARENT_PID_OPTION, "PID of the parent process", "parent-pid");
     parser.addOption(parentPIDOption);
 
@@ -151,11 +155,14 @@ AssignmentClientApp::AssignmentClientApp(int argc, char* argv[]) :
     }
 
     QString logDirectory;
-
     if (parser.isSet(logDirectoryOption)) {
         logDirectory = parser.value(logDirectoryOption);
     }
 
+    bool disableDomainPortAutoDiscovery = false;
+    if (parser.isSet(disableDomainPortAutoDiscoveryOption)) {
+        disableDomainPortAutoDiscovery = true;
+    }
 
     Assignment::Type requestAssignmentType = Assignment::AllTypes;
     if (argumentVariantMap.contains(ASSIGNMENT_TYPE_OVERRIDE_OPTION)) {
@@ -250,13 +257,15 @@ AssignmentClientApp::AssignmentClientApp(int argc, char* argv[]) :
         AssignmentClientMonitor* monitor =  new AssignmentClientMonitor(numForks, minForks, maxForks,
                                                                         requestAssignmentType, assignmentPool, listenPort,
                                                                         childMinListenPort, walletUUID, assignmentServerHostname,
-                                                                        assignmentServerPort, httpStatusPort, logDirectory);
+                                                                        assignmentServerPort, httpStatusPort, logDirectory,
+                                                                        disableDomainPortAutoDiscovery);
         monitor->setParent(this);
         connect(this, &QCoreApplication::aboutToQuit, monitor, &AssignmentClientMonitor::aboutToQuit);
     } else {
         AssignmentClient* client = new AssignmentClient(requestAssignmentType, assignmentPool, listenPort,
                                                         walletUUID, assignmentServerHostname,
-                                                        assignmentServerPort, monitorPort);
+                                                        assignmentServerPort, monitorPort,
+                                                        disableDomainPortAutoDiscovery);
         client->setParent(this);
         connect(this, &QCoreApplication::aboutToQuit, client, &AssignmentClient::aboutToQuit);
     }
diff --git a/assignment-client/src/AssignmentClientApp.h b/assignment-client/src/AssignmentClientApp.h
index 1b50922980..e48e05f4f0 100644
--- a/assignment-client/src/AssignmentClientApp.h
+++ b/assignment-client/src/AssignmentClientApp.h
@@ -4,6 +4,7 @@
 //
 //  Created by Seth Alves on 2/19/15.
 //  Copyright 2015 High Fidelity, Inc.
+//  Copyright 2021 Vircadia contributors.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -28,6 +29,7 @@ const QString ASSIGNMENT_MAX_FORKS_OPTION = "max";
 const QString ASSIGNMENT_CLIENT_MONITOR_PORT_OPTION = "monitor-port";
 const QString ASSIGNMENT_HTTP_STATUS_PORT = "http-status-port";
 const QString ASSIGNMENT_LOG_DIRECTORY = "log-directory";
+const QString ASSIGNMENT_DISABLE_DOMAIN_AUTO_PORT_DISCOVERY = "disable-domain-port-auto-discovery";
 
 class AssignmentClientApp : public QCoreApplication {
     Q_OBJECT
diff --git a/assignment-client/src/AssignmentClientMonitor.cpp b/assignment-client/src/AssignmentClientMonitor.cpp
index 68c0dfc9fd..811a731707 100644
--- a/assignment-client/src/AssignmentClientMonitor.cpp
+++ b/assignment-client/src/AssignmentClientMonitor.cpp
@@ -4,6 +4,7 @@
 //
 //  Created by Stephen Birarda on 1/10/2014.
 //  Copyright 2014 High Fidelity, Inc.
+//  Copyright 2021 Vircadia contributors.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -41,7 +42,8 @@ AssignmentClientMonitor::AssignmentClientMonitor(const unsigned int numAssignmen
                                                  const unsigned int maxAssignmentClientForks,
                                                  Assignment::Type requestAssignmentType, QString assignmentPool,
                                                  quint16 listenPort, quint16 childMinListenPort, QUuid walletUUID, QString assignmentServerHostname,
-                                                 quint16 assignmentServerPort, quint16 httpStatusServerPort, QString logDirectory) :
+                                                 quint16 assignmentServerPort, quint16 httpStatusServerPort, QString logDirectory,
+                                                 bool disableDomainPortAutoDiscovery) :
     _httpManager(QHostAddress::LocalHost, httpStatusServerPort, "", this),
     _numAssignmentClientForks(numAssignmentClientForks),
     _minAssignmentClientForks(minAssignmentClientForks),
@@ -51,7 +53,8 @@ AssignmentClientMonitor::AssignmentClientMonitor(const unsigned int numAssignmen
     _walletUUID(walletUUID),
     _assignmentServerHostname(assignmentServerHostname),
     _assignmentServerPort(assignmentServerPort),
-    _childMinListenPort(childMinListenPort)
+    _childMinListenPort(childMinListenPort),
+    _disableDomainPortAutoDiscovery(disableDomainPortAutoDiscovery)
 {
     qDebug() << "_requestAssignmentType =" << _requestAssignmentType;
 
@@ -198,6 +201,9 @@ void AssignmentClientMonitor::spawnChildClient() {
         _childArguments.append("--" + ASSIGNMENT_TYPE_OVERRIDE_OPTION);
         _childArguments.append(QString::number(_requestAssignmentType));
     }
+    if (_disableDomainPortAutoDiscovery != false) {
+        _childArguments.append("--" + ASSIGNMENT_DISABLE_DOMAIN_AUTO_PORT_DISCOVERY);
+    }
 
     if (listenPort) {
         _childArguments.append("-" + ASSIGNMENT_CLIENT_LISTEN_PORT_OPTION);
@@ -266,7 +272,7 @@ void AssignmentClientMonitor::spawnChildClient() {
             stderrPath = stderrPathTemp;
             stderrFilename = stderrFilenameTemp;
         }
-        
+
         qDebug() << "Child stdout being written to: " << stdoutFilename;
         qDebug() << "Child stderr being written to: " << stderrFilename;
     }
diff --git a/assignment-client/src/AssignmentClientMonitor.h b/assignment-client/src/AssignmentClientMonitor.h
index f5355476b7..20d4a6767b 100644
--- a/assignment-client/src/AssignmentClientMonitor.h
+++ b/assignment-client/src/AssignmentClientMonitor.h
@@ -4,6 +4,7 @@
 //
 //  Created by Stephen Birarda on 1/10/2014.
 //  Copyright 2014 High Fidelity, Inc.
+//  Copyright 2021 Vircadia contributors.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -27,7 +28,7 @@
 extern const char* NUM_FORKS_PARAMETER;
 
 struct ACProcess {
-    QProcess* process; // looks like a dangling pointer, but is parented by the AssignmentClientMonitor 
+    QProcess* process; // looks like a dangling pointer, but is parented by the AssignmentClientMonitor
     QString logStdoutPath;
     QString logStderrPath;
 };
@@ -39,7 +40,7 @@ public:
                             const unsigned int maxAssignmentClientForks, Assignment::Type requestAssignmentType,
                             QString assignmentPool, quint16 listenPort, quint16 childMinListenPort, QUuid walletUUID,
                             QString assignmentServerHostname, quint16 assignmentServerPort, quint16 httpStatusServerPort,
-                            QString logDirectory);
+                            QString logDirectory, bool disableDomainPortAutoDiscovery);
     ~AssignmentClientMonitor();
 
     void stopChildProcesses();
@@ -80,6 +81,7 @@ private:
     QSet<quint16> _childListenPorts;
 
     bool _wantsChildFileLogging { false };
+    bool _disableDomainPortAutoDiscovery { false };
 };
 
 #endif // hifi_AssignmentClientMonitor_h
diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp
index a975302699..cf443367a4 100644
--- a/libraries/networking/src/NodeList.cpp
+++ b/libraries/networking/src/NodeList.cpp
@@ -377,7 +377,7 @@ void NodeList::sendDomainServerCheckIn() {
             // if so we need to make sure we have an up-to-date local port in case it restarted
 
             if (domainSockAddr.getAddress() == QHostAddress::LocalHost
-                || hostname == "localhost") {
+                || hostname == "localhost" && _domainPortAutoDiscovery == true) {
 
                 quint16 domainPort = DEFAULT_DOMAIN_SERVER_PORT;
                 getLocalServerPortFromSharedMemory(DOMAIN_SERVER_LOCAL_PORT_SMEM_KEY, domainPort);
@@ -534,7 +534,7 @@ void NodeList::sendDomainServerCheckIn() {
             sendPacket(std::move(packetCopy), domainSockAddr);
         }
         sendPacket(std::move(domainPacket), domainSockAddr);
-        
+
     }
 }
 
@@ -661,7 +661,7 @@ void NodeList::handleICEConnectionToDomainServer() {
                                                   _domainHandler.getICEClientID(),
                                                   _domainHandler.getPendingDomainID());
     }
-} 
+}
 
 void NodeList::pingPunchForDomainServer() {
     // make sure if we're here that we actually still need to ping the domain-server
@@ -713,7 +713,7 @@ void NodeList::processDomainServerConnectionTokenPacket(QSharedPointer<ReceivedM
 
 void NodeList::processDomainServerList(QSharedPointer<ReceivedMessage> message) {
 
-    // parse header information 
+    // parse header information
     QDataStream packetStream(message->getMessage());
 
     // grab the domain's ID from the beginning of the packet
@@ -794,7 +794,7 @@ void NodeList::processDomainServerList(QSharedPointer<ReceivedMessage> message)
 
     if (_domainHandler.isConnected() && _domainHandler.getUUID() != domainUUID) {
         // Received packet from different domain.
-        qWarning() << "IGNORING DomainList packet from" << domainUUID << "while connected to" 
+        qWarning() << "IGNORING DomainList packet from" << domainUUID << "while connected to"
                    << _domainHandler.getUUID() << ": sent " << pingLagTime << " msec ago.";
         qWarning(networking) << "DomainList request lag (interface->ds): " << domainServerRequestLag << "msec";
         qWarning(networking) << "DomainList server processing time: " << domainServerCheckinProcessingTime << "usec";
@@ -821,9 +821,9 @@ void NodeList::processDomainServerList(QSharedPointer<ReceivedMessage> message)
     setSessionLocalID(newLocalID);
     setSessionUUID(newUUID);
 
-    // FIXME: Remove this call to requestDomainSettings() and reinstate the one in DomainHandler::setIsConnected(), in version 
+    // FIXME: Remove this call to requestDomainSettings() and reinstate the one in DomainHandler::setIsConnected(), in version
     // 2021.2.0. (New protocol version implies a domain server upgrade.)
-    if (!_domainHandler.isConnected() 
+    if (!_domainHandler.isConnected()
             && _domainHandler.getScheme() == URL_SCHEME_HIFI && !_domainHandler.getHostname().isEmpty()) {
         // We're about to connect but we need the domain settings (in particular, the node permissions) in order to adjust the
         // canRezAvatarEntities permission above before using the permissions in determining whether or not to connect without
@@ -831,7 +831,7 @@ void NodeList::processDomainServerList(QSharedPointer<ReceivedMessage> message)
         _domainHandler.requestDomainSettings();
     }
 
-    // Don't continue login to the domain if have avatar entities and don't have permissions to rez them, unless user has OKed 
+    // Don't continue login to the domain if have avatar entities and don't have permissions to rez them, unless user has OKed
     // continuing login.
     if (!newPermissions.can(NodePermissions::Permission::canRezAvatarEntities)
             && (!adjustedPermissions || !_domainHandler.canConnectWithoutAvatarEntities())) {
@@ -920,7 +920,7 @@ void NodeList::pingPunchForInactiveNode(const SharedNodePointer& node) {
     if (node->getConnectionAttempts() > 0 && node->getConnectionAttempts() % NUM_DEBUG_CONNECTION_ATTEMPTS == 0) {
         qCDebug(networking) << "No response to UDP hole punch pings for node" << node->getUUID() << "in last 2 s.";
     }
-    
+
     auto nodeID = node->getUUID();
 
     // send the ping packet to the local and public sockets for this node
diff --git a/libraries/networking/src/NodeList.h b/libraries/networking/src/NodeList.h
index 59b3815fba..685b998269 100644
--- a/libraries/networking/src/NodeList.h
+++ b/libraries/networking/src/NodeList.h
@@ -70,6 +70,8 @@ public:
     void setAssignmentServerSocket(const HifiSockAddr& serverSocket) { _assignmentServerSocket = serverSocket; }
     void sendAssignment(Assignment& assignment);
 
+    void setDomainPortAutoDiscovery(bool enabled = true) { _domainPortAutoDiscovery = enabled; };
+
     void setIsShuttingDown(bool isShuttingDown) { _isShuttingDown = isShuttingDown; }
 
     void ignoreNodesInRadius(bool enabled = true);
@@ -105,7 +107,7 @@ public:
 public slots:
     void reset(QString reason, bool skipDomainHandlerReset = false);
     void resetFromDomainHandler() { reset("Reset from Domain Handler", true); }
-    
+
     void sendDomainServerCheckIn();
     void handleDSPathQuery(const QString& newPath);
 
@@ -180,6 +182,7 @@ private:
     bool _requestsDomainListData { false };
 
     bool _sendDomainServerCheckInEnabled { true };
+    bool _domainPortAutoDiscovery { true };
 
     mutable QReadWriteLock _ignoredSetLock;
     tbb::concurrent_unordered_set<QUuid, UUIDHasher> _ignoredNodeIDs;

From d1cf862e45db1a955a46b62353c9b3b5a1715755 Mon Sep 17 00:00:00 2001
From: Kalila <69767640+digisomni@users.noreply.github.com>
Date: Fri, 25 Jun 2021 01:45:31 -0400
Subject: [PATCH 02/27] Update vircadia-assignment-client.service

---
 pkg-scripts/vircadia-assignment-client.service | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg-scripts/vircadia-assignment-client.service b/pkg-scripts/vircadia-assignment-client.service
index 9c86e4e874..c53fa5ddc7 100644
--- a/pkg-scripts/vircadia-assignment-client.service
+++ b/pkg-scripts/vircadia-assignment-client.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Assignment client service for Vircadia server
+Description=Assignment client service for the Vircadia Server
 After=network.target
 PartOf=vircadia-server.target
 
@@ -12,7 +12,7 @@ User=vircadia
 Group=vircadia
 #LimitCORE=infinity
 #ExecStart=/opt/vircadia/assignment-client -n 6
-ExecStart=/opt/vircadia/assignment-client --min 6 --max 20
+ExecStart=/opt/vircadia/assignment-client --min 6 --max 20 --disable-domain-port-auto-discovery
 
 [Install]
 WantedBy=multi-user.target

From 42a4e3b186ee7b0a52fd6b8931144049380721b4 Mon Sep 17 00:00:00 2001
From: Kalila <69767640+digisomni@users.noreply.github.com>
Date: Fri, 25 Jun 2021 01:45:49 -0400
Subject: [PATCH 03/27] Update vircadia-assignment-client@.service

---
 pkg-scripts/vircadia-assignment-client@.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg-scripts/vircadia-assignment-client@.service b/pkg-scripts/vircadia-assignment-client@.service
index 4684947426..ec8158b6db 100644
--- a/pkg-scripts/vircadia-assignment-client@.service
+++ b/pkg-scripts/vircadia-assignment-client@.service
@@ -14,7 +14,7 @@ User=vircadia
 Group=vircadia
 #LimitCORE=infinity
 #ExecStart=/opt/vircadia/assignment-client -n 6
-ExecStart=/opt/vircadia/assignment-client --min 6 --max 20 --server-port $HIFI_DOMAIN_SERVER_PORT
+ExecStart=/opt/vircadia/assignment-client --min 6 --max 20 --server-port $HIFI_DOMAIN_SERVER_PORT --disable-domain-port-auto-discovery
 
 [Install]
 WantedBy=multi-user.target

From a217f80ee3415433529811d2c92cac054eec85a2 Mon Sep 17 00:00:00 2001
From: Kalila <69767640+digisomni@users.noreply.github.com>
Date: Sun, 27 Jun 2021 04:14:21 -0400
Subject: [PATCH 04/27] Update NodeList.cpp

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

diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp
index cf443367a4..41900d6130 100644
--- a/libraries/networking/src/NodeList.cpp
+++ b/libraries/networking/src/NodeList.cpp
@@ -376,8 +376,8 @@ void NodeList::sendDomainServerCheckIn() {
             // is this our localhost domain-server?
             // if so we need to make sure we have an up-to-date local port in case it restarted
 
-            if (domainSockAddr.getAddress() == QHostAddress::LocalHost
-                || hostname == "localhost" && _domainPortAutoDiscovery == true) {
+            if ((domainSockAddr.getAddress() == QHostAddress::LocalHost || hostname == "localhost")
+                && _domainPortAutoDiscovery == true) {
 
                 quint16 domainPort = DEFAULT_DOMAIN_SERVER_PORT;
                 getLocalServerPortFromSharedMemory(DOMAIN_SERVER_LOCAL_PORT_SMEM_KEY, domainPort);

From 88b9b7468e3b8dc89f504dcc69b7ee9de2359174 Mon Sep 17 00:00:00 2001
From: Kalila L <somnilibertas@gmail.com>
Date: Sun, 27 Jun 2021 04:31:14 -0400
Subject: [PATCH 05/27] CR.

---
 assignment-client/src/AssignmentClient.cpp     | 2 +-
 libraries/networking/src/NodeList.cpp          | 2 +-
 libraries/networking/src/NodeList.h            | 4 ++--
 pkg-scripts/vircadia-assignment-client.service | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/assignment-client/src/AssignmentClient.cpp b/assignment-client/src/AssignmentClient.cpp
index 8e44cdd157..29125fee6f 100644
--- a/assignment-client/src/AssignmentClient.cpp
+++ b/assignment-client/src/AssignmentClient.cpp
@@ -95,7 +95,7 @@ AssignmentClient::AssignmentClient(Assignment::Type requestAssignmentType, QStri
         qCDebug(assignment_client) << "Disabling domain port auto discovery by the assignment client due to parsed command line parameter.";
     }
 
-    nodeList->setDomainPortAutoDiscovery(_disableDomainPortAutoDiscovery);
+    nodeList->disableDomainPortAutoDiscovery(_disableDomainPortAutoDiscovery);
 
     qCDebug(assignment_client) << "Assignment server socket is" << _assignmentServerSocket;
 
diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp
index 41900d6130..3d28457633 100644
--- a/libraries/networking/src/NodeList.cpp
+++ b/libraries/networking/src/NodeList.cpp
@@ -377,7 +377,7 @@ void NodeList::sendDomainServerCheckIn() {
             // if so we need to make sure we have an up-to-date local port in case it restarted
 
             if ((domainSockAddr.getAddress() == QHostAddress::LocalHost || hostname == "localhost")
-                && _domainPortAutoDiscovery == true) {
+                && _domainPortAutoDiscovery == false) {
 
                 quint16 domainPort = DEFAULT_DOMAIN_SERVER_PORT;
                 getLocalServerPortFromSharedMemory(DOMAIN_SERVER_LOCAL_PORT_SMEM_KEY, domainPort);
diff --git a/libraries/networking/src/NodeList.h b/libraries/networking/src/NodeList.h
index 685b998269..9c47abbd9f 100644
--- a/libraries/networking/src/NodeList.h
+++ b/libraries/networking/src/NodeList.h
@@ -70,7 +70,7 @@ public:
     void setAssignmentServerSocket(const HifiSockAddr& serverSocket) { _assignmentServerSocket = serverSocket; }
     void sendAssignment(Assignment& assignment);
 
-    void setDomainPortAutoDiscovery(bool enabled = true) { _domainPortAutoDiscovery = enabled; };
+    void disableDomainPortAutoDiscovery(bool disabled = false) { _domainPortAutoDiscovery = disabled; };
 
     void setIsShuttingDown(bool isShuttingDown) { _isShuttingDown = isShuttingDown; }
 
@@ -182,7 +182,7 @@ private:
     bool _requestsDomainListData { false };
 
     bool _sendDomainServerCheckInEnabled { true };
-    bool _domainPortAutoDiscovery { true };
+    bool _domainPortAutoDiscovery { false };
 
     mutable QReadWriteLock _ignoredSetLock;
     tbb::concurrent_unordered_set<QUuid, UUIDHasher> _ignoredNodeIDs;
diff --git a/pkg-scripts/vircadia-assignment-client.service b/pkg-scripts/vircadia-assignment-client.service
index c53fa5ddc7..d8b64be416 100644
--- a/pkg-scripts/vircadia-assignment-client.service
+++ b/pkg-scripts/vircadia-assignment-client.service
@@ -12,7 +12,7 @@ User=vircadia
 Group=vircadia
 #LimitCORE=infinity
 #ExecStart=/opt/vircadia/assignment-client -n 6
-ExecStart=/opt/vircadia/assignment-client --min 6 --max 20 --disable-domain-port-auto-discovery
+ExecStart=/opt/vircadia/assignment-client --min 6 --max 20
 
 [Install]
 WantedBy=multi-user.target

From 241c54919d82e3381174c23cbca009c7a056fab1 Mon Sep 17 00:00:00 2001
From: Kalila <69767640+digisomni@users.noreply.github.com>
Date: Thu, 15 Jul 2021 22:19:58 -0400
Subject: [PATCH 06/27] Apply suggestions from code review

Co-authored-by: David Rowe <david@ctrlaltstudio.com>
---
 assignment-client/src/AssignmentClient.cpp        | 2 +-
 assignment-client/src/AssignmentClientMonitor.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/assignment-client/src/AssignmentClient.cpp b/assignment-client/src/AssignmentClient.cpp
index 29125fee6f..3eb3c83b83 100644
--- a/assignment-client/src/AssignmentClient.cpp
+++ b/assignment-client/src/AssignmentClient.cpp
@@ -193,7 +193,7 @@ void AssignmentClient::sendAssignmentRequest() {
 
         auto nodeList = DependencyManager::get<NodeList>();
 
-        if (_assignmentServerHostname == "localhost" && _disableDomainPortAutoDiscovery == false) {
+        if (_assignmentServerHostname == "localhost" && !_disableDomainPortAutoDiscovery) {
             // we want to check again for the local domain-server port in case the DS has restarted
             quint16 localAssignmentServerPort;
             if (nodeList->getLocalServerPortFromSharedMemory(DOMAIN_SERVER_LOCAL_PORT_SMEM_KEY, localAssignmentServerPort)) {
diff --git a/assignment-client/src/AssignmentClientMonitor.cpp b/assignment-client/src/AssignmentClientMonitor.cpp
index 811a731707..43d788f5d1 100644
--- a/assignment-client/src/AssignmentClientMonitor.cpp
+++ b/assignment-client/src/AssignmentClientMonitor.cpp
@@ -201,7 +201,7 @@ void AssignmentClientMonitor::spawnChildClient() {
         _childArguments.append("--" + ASSIGNMENT_TYPE_OVERRIDE_OPTION);
         _childArguments.append(QString::number(_requestAssignmentType));
     }
-    if (_disableDomainPortAutoDiscovery != false) {
+    if (_disableDomainPortAutoDiscovery) {
         _childArguments.append("--" + ASSIGNMENT_DISABLE_DOMAIN_AUTO_PORT_DISCOVERY);
     }
 

From f795418fd7c7b115244e52622d83f95e4fd5ab36 Mon Sep 17 00:00:00 2001
From: Kalila L <somnilibertas@gmail.com>
Date: Fri, 16 Jul 2021 04:23:21 -0400
Subject: [PATCH 07/27] Update supporter info for README.md.

---
 README.md | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index b84849b205..a4067e30ab 100644
--- a/README.md
+++ b/README.md
@@ -73,8 +73,16 @@ Vircadia consists of many projects and codebases with its unifying structure's g
 
 There are many contributors to Vircadia. Code writers, reviewers, testers, documentation writers, modelers, and general supporters of the project are all integral to its development and success towards its goals. Find out how you can [contribute](CONTRIBUTING.md)!
 
-### [Supporters](https://github.com/sponsors/digisomni/)
+### Support
 
-| [Karol Suprynowicz - 74hc595](https://github.com/ksuprynowicz) | 
+You can support the Vircadia project financially through [GitHub Sponsors](https://github.com/sponsors/digisomni/).
+
+You can also support individual active contributors by visiting each repository, this is the main Vircadia repository's [list of active contributors](https://vircadia.com/contributors-redirector/?redirect=vircadia/vircadia). Click on a contributor's profile to see if they accept donations!
+
+Keep in mind that Vircadia consists of multiple smaller projects that might have different active contributors. This is a [a non-exhaustive list](https://github.com/vircadia).
+
+#### Supporters of the Vircadia Project
+
+| [Karol Suprynowicz - 74hc595](https://github.com/ksuprynowicz) |
 | --- |
-| <p align="center">[![ksuprynowicz](https://avatars.githubusercontent.com/u/11568651?s=64&v=4)](https://github.com/ksuprynowicz)</p>
+| <p align="center">[![ksuprynowicz](https://avatars.githubusercontent.com/u/11568651?s=64&v=4)](https://github.com/ksuprynowicz)</p>
\ No newline at end of file

From 11e1e0c201f75b530de52558f17c6c6bbf894d08 Mon Sep 17 00:00:00 2001
From: Kalila L <somnilibertas@gmail.com>
Date: Fri, 16 Jul 2021 04:33:59 -0400
Subject: [PATCH 08/27] Update image for supporter: ksuprynowicz.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a4067e30ab..c1cd8323e9 100644
--- a/README.md
+++ b/README.md
@@ -85,4 +85,4 @@ Keep in mind that Vircadia consists of multiple smaller projects that might have
 
 | [Karol Suprynowicz - 74hc595](https://github.com/ksuprynowicz) |
 | --- |
-| <p align="center">[![ksuprynowicz](https://avatars.githubusercontent.com/u/11568651?s=64&v=4)](https://github.com/ksuprynowicz)</p>
\ No newline at end of file
+| <p align="center">[<img src="https://vircadia.com/wp-content/uploads/2021/07/74hc595_profile_2-1.png" width="80" alt="ksuprynowicz" />](https://github.com/ksuprynowicz)</p>
\ No newline at end of file

From 8d19d0826812a62eca7f145a6987a32fdb81aa03 Mon Sep 17 00:00:00 2001
From: Dale Glass <dale@daleglass.net>
Date: Fri, 6 Aug 2021 18:44:53 +0200
Subject: [PATCH 09/27] Fix QDir::operator= is deprecated

---
 interface/src/Application.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 759a96388d..3c26587d1e 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1965,7 +1965,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     }
 
     QString scriptsSwitch = QString("--").append(SCRIPTS_SWITCH);
-    _defaultScriptsLocation = getCmdOption(argc, constArgv, scriptsSwitch.toStdString().c_str());
+    _defaultScriptsLocation.setPath(getCmdOption(argc, constArgv, scriptsSwitch.toStdString().c_str()));
 
     // Make sure we don't time out during slow operations at startup
     updateHeartbeat();

From 24ab523acc1175ec1164a847ed7ddfc816f477ac Mon Sep 17 00:00:00 2001
From: Dale Glass <dale@daleglass.net>
Date: Fri, 6 Aug 2021 23:26:02 +0200
Subject: [PATCH 10/27] Replace deprecated QAbstractsocket::error with
 QAbstractSocket::errorOccurred

---
 libraries/networking/src/LimitedNodeList.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp
index 65e391d467..d45aca2f89 100644
--- a/libraries/networking/src/LimitedNodeList.cpp
+++ b/libraries/networking/src/LimitedNodeList.cpp
@@ -1224,8 +1224,7 @@ void LimitedNodeList::updateLocalSocket() {
     QTcpSocket* localIPTestSocket = new QTcpSocket;
 
     connect(localIPTestSocket, &QTcpSocket::connected, this, &LimitedNodeList::connectedForLocalSocketTest);
-    connect(localIPTestSocket, static_cast<void(QTcpSocket::*)(QAbstractSocket::SocketError)>(&QTcpSocket::error),
-        this, &LimitedNodeList::errorTestingLocalSocket);
+    connect(localIPTestSocket, &QTcpSocket::errorOccurred, this, &LimitedNodeList::errorTestingLocalSocket);
 
     // attempt to connect to our reliable host
     localIPTestSocket->connectToHost(RELIABLE_LOCAL_IP_CHECK_HOST, RELIABLE_LOCAL_IP_CHECK_PORT);

From eb146fa434f3f0259051ad100576ceeeec5a3453 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 12 Aug 2021 08:34:58 +0000
Subject: [PATCH 11/27] Bump path-parse from 1.0.6 to 1.0.7 in /screenshare

Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/jbgutierrez/path-parse/releases)
- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)

---
updated-dependencies:
- dependency-name: path-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 screenshare/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/screenshare/package-lock.json b/screenshare/package-lock.json
index 6bb34b21a5..16a9828357 100644
--- a/screenshare/package-lock.json
+++ b/screenshare/package-lock.json
@@ -1014,9 +1014,9 @@
       "dev": true
     },
     "path-parse": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
       "dev": true
     },
     "pend": {

From ae9f2aa1ee6724f855744b399fc4f684a2c81208 Mon Sep 17 00:00:00 2001
From: Dale Glass <dale@daleglass.net>
Date: Thu, 12 Aug 2021 22:53:24 +0200
Subject: [PATCH 12/27] Update slots to the new syntax, use
 QAbstractSocket::errorOccurred

---
 libraries/embedded-webserver/src/HTTPConnection.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/embedded-webserver/src/HTTPConnection.cpp b/libraries/embedded-webserver/src/HTTPConnection.cpp
index 4c00ba676c..5932c7ed56 100644
--- a/libraries/embedded-webserver/src/HTTPConnection.cpp
+++ b/libraries/embedded-webserver/src/HTTPConnection.cpp
@@ -124,9 +124,9 @@ HTTPConnection::HTTPConnection(QTcpSocket* socket, HTTPManager* parentManager) :
     _socket->setParent(this);
 
     // connect initial slots
-    connect(socket, SIGNAL(readyRead()), SLOT(readRequest()));
-    connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), SLOT(deleteLater()));
-    connect(socket, SIGNAL(disconnected()), SLOT(deleteLater()));
+    connect(socket, &QAbstractSocket::readyRead, this, &HTTPConnection::readRequest);
+    connect(socket, &QAbstractSocket::errorOccurred, this, &HTTPConnection::deleteLater);
+    connect(socket, &QAbstractSocket::disconnected, this, &HTTPConnection::deleteLater);
 }
 
 HTTPConnection::~HTTPConnection() {

From 8a8093e529e9653cf7817c18caa1531190bd64be Mon Sep 17 00:00:00 2001
From: Dale Glass <dale@daleglass.net>
Date: Thu, 12 Aug 2021 23:49:44 +0200
Subject: [PATCH 13/27] Log the location of the primary resources file

Also emit the full path to the file in the exception
---
 interface/src/Application.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 349e1db18f..a078cb265a 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -805,11 +805,13 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) {
 
     {
         const QString resourcesBinaryFile = PathUtils::getRccPath();
+        qCInfo(interfaceapp) << "Loading primary resources from" << resourcesBinaryFile;
+
         if (!QFile::exists(resourcesBinaryFile)) {
-            throw std::runtime_error("Unable to find primary resources");
+            throw std::runtime_error(QString("Unable to find primary resources from '%1'").arg(resourcesBinaryFile).toStdString());
         }
         if (!QResource::registerResource(resourcesBinaryFile)) {
-            throw std::runtime_error("Unable to load primary resources");
+            throw std::runtime_error(QString("Unable to load primary resources from '%1'").arg(resourcesBinaryFile).toStdString());
         }
     }
 

From 019e012f2ef6dcfca16425eb6b824dea1eb586cb Mon Sep 17 00:00:00 2001
From: Kalila <69767640+digisomni@users.noreply.github.com>
Date: Thu, 12 Aug 2021 23:01:13 -0400
Subject: [PATCH 14/27] Apply suggestions from code review

Co-authored-by: Heather Anderson <heath@odysseus.anderson.name>
---
 assignment-client/src/AssignmentClient.cpp | 2 +-
 libraries/networking/src/NodeList.cpp      | 2 +-
 libraries/networking/src/NodeList.h        | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/assignment-client/src/AssignmentClient.cpp b/assignment-client/src/AssignmentClient.cpp
index 1f18709a91..d8dac8ef36 100644
--- a/assignment-client/src/AssignmentClient.cpp
+++ b/assignment-client/src/AssignmentClient.cpp
@@ -91,7 +91,7 @@ AssignmentClient::AssignmentClient(Assignment::Type requestAssignmentType, QStri
     _assignmentServerSocket.setObjectName("AssignmentServer");
     nodeList->setAssignmentServerSocket(_assignmentServerSocket);
 
-    if (disableDomainPortAutoDiscovery == true) {
+    if (disableDomainPortAutoDiscovery) {
         _disableDomainPortAutoDiscovery = disableDomainPortAutoDiscovery;
         qCDebug(assignment_client) << "Disabling domain port auto discovery by the assignment client due to parsed command line parameter.";
     }
diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp
index 1e07e14803..5f066b3eb3 100644
--- a/libraries/networking/src/NodeList.cpp
+++ b/libraries/networking/src/NodeList.cpp
@@ -377,7 +377,7 @@ void NodeList::sendDomainServerCheckIn() {
             // if so we need to make sure we have an up-to-date local port in case it restarted
 
             if ((domainSockAddr.getAddress() == QHostAddress::LocalHost || hostname == "localhost")
-                && _domainPortAutoDiscovery == false) {
+                && _domainPortAutoDiscovery) {
 
                 quint16 domainPort = DEFAULT_DOMAIN_SERVER_PORT;
                 getLocalServerPortFromSharedMemory(DOMAIN_SERVER_LOCAL_PORT_SMEM_KEY, domainPort);
diff --git a/libraries/networking/src/NodeList.h b/libraries/networking/src/NodeList.h
index 1c01d384cc..fa6781c4bd 100644
--- a/libraries/networking/src/NodeList.h
+++ b/libraries/networking/src/NodeList.h
@@ -71,7 +71,7 @@ public:
     void setAssignmentServerSocket(const SockAddr& serverSocket) { _assignmentServerSocket = serverSocket; }
     void sendAssignment(Assignment& assignment);
 
-    void disableDomainPortAutoDiscovery(bool disabled = false) { _domainPortAutoDiscovery = disabled; };
+    void disableDomainPortAutoDiscovery(bool disabled = false) { _domainPortAutoDiscovery = !disabled; };
 
     void setIsShuttingDown(bool isShuttingDown) { _isShuttingDown = isShuttingDown; }
 
@@ -183,7 +183,7 @@ private:
     bool _requestsDomainListData { false };
 
     bool _sendDomainServerCheckInEnabled { true };
-    bool _domainPortAutoDiscovery { false };
+    bool _domainPortAutoDiscovery { true };
 
     mutable QReadWriteLock _ignoredSetLock;
     tbb::concurrent_unordered_set<QUuid, UUIDHasher> _ignoredNodeIDs;

From e4cb87ba5d91091e6722808de6f0e541ff13a943 Mon Sep 17 00:00:00 2001
From: Kalila L <somnilibertas@gmail.com>
Date: Thu, 12 Aug 2021 23:02:39 -0400
Subject: [PATCH 15/27] CR.

---
 pkg-scripts/vircadia-assignment-client.service  | 2 +-
 pkg-scripts/vircadia-assignment-client@.service | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg-scripts/vircadia-assignment-client.service b/pkg-scripts/vircadia-assignment-client.service
index d8b64be416..be5b450519 100644
--- a/pkg-scripts/vircadia-assignment-client.service
+++ b/pkg-scripts/vircadia-assignment-client.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Assignment client service for the Vircadia Server
+Description=Assignment client service for the Vircadia server
 After=network.target
 PartOf=vircadia-server.target
 
diff --git a/pkg-scripts/vircadia-assignment-client@.service b/pkg-scripts/vircadia-assignment-client@.service
index ec8158b6db..4595bbf9f7 100644
--- a/pkg-scripts/vircadia-assignment-client@.service
+++ b/pkg-scripts/vircadia-assignment-client@.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Assignment client service for Vircadia server
+Description=Assignment client service for the Vircadia server
 After=network.target
 PartOf=vircadia-server@%i.target
 

From 76010bf650f36e83f943a91289b3666becf4fe78 Mon Sep 17 00:00:00 2001
From: Kalila L <somnilibertas@gmail.com>
Date: Fri, 13 Aug 2021 10:29:16 -0400
Subject: [PATCH 16/27] Update help text for disable domain server port auto
 discovery option.

---
 assignment-client/src/AssignmentClientApp.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/assignment-client/src/AssignmentClientApp.cpp b/assignment-client/src/AssignmentClientApp.cpp
index 49674f5728..41d0de7f9a 100644
--- a/assignment-client/src/AssignmentClientApp.cpp
+++ b/assignment-client/src/AssignmentClientApp.cpp
@@ -100,7 +100,8 @@ AssignmentClientApp::AssignmentClientApp(int argc, char* argv[]) :
     const QCommandLineOption logDirectoryOption(ASSIGNMENT_LOG_DIRECTORY, "directory to store logs", "log-directory");
     parser.addOption(logDirectoryOption);
 
-    const QCommandLineOption disableDomainPortAutoDiscoveryOption(ASSIGNMENT_DISABLE_DOMAIN_AUTO_PORT_DISCOVERY, "disable automatic discovery of the domain server port");
+    const QCommandLineOption disableDomainPortAutoDiscoveryOption(ASSIGNMENT_DISABLE_DOMAIN_AUTO_PORT_DISCOVERY,
+        "assignment clients automatically search for the domain server on the local machine, if networking is being managed, then disable automatic discovery of the domain server port");
     parser.addOption(disableDomainPortAutoDiscoveryOption);
 
     const QCommandLineOption parentPIDOption(PARENT_PID_OPTION, "PID of the parent process", "parent-pid");

From 1122156d3a09afadcf2f3d50914d6d1a2d7db1bf Mon Sep 17 00:00:00 2001
From: Alezia Kurdis <60075796+AleziaKurdis@users.noreply.github.com>
Date: Sun, 15 Aug 2021 22:07:00 -0400
Subject: [PATCH 17/27] Add secondary red class button

Add secondary red class button
for "Set Rotation to Zero" button
---
 scripts/system/html/css/edit-style.css | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/scripts/system/html/css/edit-style.css b/scripts/system/html/css/edit-style.css
index 5aea382d63..d912cd5d4c 100644
--- a/scripts/system/html/css/edit-style.css
+++ b/scripts/system/html/css/edit-style.css
@@ -479,7 +479,22 @@ input[type=button].secondary, button.hifi-edit-button.secondary {
     background: linear-gradient(#343434 20%, #000 100%);
     cursor: pointer;
 }
-
+input[type=button].secondary_red, button.hifi-edit-button.secondary_red {
+    font-family: Raleway-Bold;
+    font-size: 10px;
+    text-transform: uppercase;
+    vertical-align: top;
+    height: 18px;
+    min-width: 60px;
+    padding: 0 14px;
+    margin-right: 6px;
+    border-radius: 4px;
+    border: none;
+    color: #fff;
+    background-color: #94132e;
+    background: linear-gradient(#d42043 20%, #94132e 100%);
+    cursor: pointer;
+}
 input[type=button]:enabled:hover, button.hifi-edit-button:enabled:hover {
     background: linear-gradient(#000, #000);
     border: none;

From 0d39eea2a671f867437247d82be883a319aa8537 Mon Sep 17 00:00:00 2001
From: Alezia Kurdis <60075796+AleziaKurdis@users.noreply.github.com>
Date: Sun, 15 Aug 2021 22:08:46 -0400
Subject: [PATCH 18/27] Add "Set Rotation to Zero"

Add a "Set Rotation to Zero" button
in properties tab (Spatial section)
of the create app.
---
 scripts/system/create/edit.js | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/scripts/system/create/edit.js b/scripts/system/create/edit.js
index 614bd5fd59..727f8ca28d 100644
--- a/scripts/system/create/edit.js
+++ b/scripts/system/create/edit.js
@@ -2656,6 +2656,24 @@ var PropertiesTool = function (opts) {
                 } else {
                     audioFeedback.rejection();
                 }
+            } else if (data.action === "setRotationToZero") {
+                if (selectionManager.selections.length === 1 && SelectionManager.hasUnlockedSelection()) {
+                    selectionManager.saveProperties();
+                    var parentState = getParentState(selectionManager.selections[0]);
+                    if ((parentState === "PARENT_CHILDREN" || parentState === "CHILDREN") && selectionDisplay.getSpaceMode() === "local" ) {
+                        Entities.editEntity(selectionManager.selections[0], {
+                            localRotation: Quat.IDENTITY
+                        });                    
+                    } else {
+                        Entities.editEntity(selectionManager.selections[0], {
+                            rotation: Quat.IDENTITY
+                        });
+                    }
+                    pushCommandForSelections();
+                    selectionManager._update(false, this);
+                } else {
+                    audioFeedback.rejection();
+                }
             }
         } else if (data.type === "propertiesPageReady") {
             updateSelections(true);

From 494740f819eabfcddb28c04e05d73e75d2071574 Mon Sep 17 00:00:00 2001
From: Alezia Kurdis <60075796+AleziaKurdis@users.noreply.github.com>
Date: Sun, 15 Aug 2021 22:09:27 -0400
Subject: [PATCH 19/27] Add a "Set Rotation to Zero" button

Add a "Set Rotation to Zero" button
in properties tab (Spatial section)
of the create app.
---
 .../html/js/entityProperties.js               | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/scripts/system/create/entityProperties/html/js/entityProperties.js b/scripts/system/create/entityProperties/html/js/entityProperties.js
index 65e14d7203..82015c6350 100644
--- a/scripts/system/create/entityProperties/html/js/entityProperties.js
+++ b/scripts/system/create/entityProperties/html/js/entityProperties.js
@@ -1383,7 +1383,8 @@ const GROUPS = [
             {
                 type: "buttons",
                 buttons: [  { id: "copyRotation", label: "Copy Rotation", className: "secondary", onClick: copyRotationProperty },
-                            { id: "pasteRotation", label: "Paste Rotation", className: "secondary", onClick: pasteRotationProperty } ],
+                            { id: "pasteRotation", label: "Paste Rotation", className: "secondary", onClick: pasteRotationProperty },
+                            { id: "setRotationToZero", label: "Set Rotation to Zero", className: "secondary_red", onClick: setRotationToZeroProperty }],
                 propertyID: "copyPasteRotation"
             },          
             {
@@ -1874,10 +1875,16 @@ function setCopyPastePositionAndRotationAvailability (selectionLength, islocked)
     
     if (selectionLength > 0 && !islocked) {
         $('#property-copyPastePosition-button-pastePosition').attr('disabled', false);
-        $('#property-copyPasteRotation-button-pasteRotation').attr('disabled', false);           
+        $('#property-copyPasteRotation-button-pasteRotation').attr('disabled', false);
+        if (selectionLength === 1) {
+            $('#property-copyPasteRotation-button-setRotationToZero').attr('disabled', false);
+        } else {
+            $('#property-copyPasteRotation-button-setRotationToZero').attr('disabled', true);
+        }
     } else {
         $('#property-copyPastePosition-button-pastePosition').attr('disabled', true);
-        $('#property-copyPasteRotation-button-pasteRotation').attr('disabled', true);            
+        $('#property-copyPasteRotation-button-pasteRotation').attr('disabled', true);
+        $('#property-copyPasteRotation-button-setRotationToZero').attr('disabled', true);
     }
 }
 
@@ -3273,7 +3280,12 @@ function pasteRotationProperty() {
         action: "pasteRotation"
     }));    
 }
-
+function setRotationToZeroProperty() {
+    EventBridge.emitWebEvent(JSON.stringify({
+        type: "action",
+        action: "setRotationToZero"
+    }));    
+}
 /**
  * USER DATA FUNCTIONS
  */

From b61d978b0a5e17db785ed871a2643cd6408d4ef5 Mon Sep 17 00:00:00 2001
From: Alezia Kurdis <60075796+AleziaKurdis@users.noreply.github.com>
Date: Tue, 17 Aug 2021 21:48:12 -0400
Subject: [PATCH 20/27] Change the label for "Reset Rotation"

Change the label for "Reset Rotation"
---
 .../system/create/entityProperties/html/js/entityProperties.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/system/create/entityProperties/html/js/entityProperties.js b/scripts/system/create/entityProperties/html/js/entityProperties.js
index 82015c6350..ff538af016 100644
--- a/scripts/system/create/entityProperties/html/js/entityProperties.js
+++ b/scripts/system/create/entityProperties/html/js/entityProperties.js
@@ -1384,7 +1384,7 @@ const GROUPS = [
                 type: "buttons",
                 buttons: [  { id: "copyRotation", label: "Copy Rotation", className: "secondary", onClick: copyRotationProperty },
                             { id: "pasteRotation", label: "Paste Rotation", className: "secondary", onClick: pasteRotationProperty },
-                            { id: "setRotationToZero", label: "Set Rotation to Zero", className: "secondary_red", onClick: setRotationToZeroProperty }],
+                            { id: "setRotationToZero", label: "Reset Rotation", className: "secondary_red", onClick: setRotationToZeroProperty }],
                 propertyID: "copyPasteRotation"
             },          
             {

From 0cf71bd3e13e70ee8c9dda6ca9557e8115cf1338 Mon Sep 17 00:00:00 2001
From: SilverfishVR <53531160+SilverfishVR@users.noreply.github.com>
Date: Wed, 18 Aug 2021 22:19:10 +0200
Subject: [PATCH 21/27] make HUD bubble/shield button optional

Adds an menu item in "Settings" to toggle the HUD shield/bubble button on or off.
Shield button remains available in the tablet or toolbar, it is called "HUD shield button" but suggestions are welcome

fixes https://github.com/vircadia/vircadia/issues/1210
---
 scripts/system/bubble.js | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/scripts/system/bubble.js b/scripts/system/bubble.js
index eca3b3dcd4..0c019f4e4b 100644
--- a/scripts/system/bubble.js
+++ b/scripts/system/bubble.js
@@ -46,6 +46,27 @@
         });
     }
 
+    //create a menu item in "Setings" to toggle the bubble/shield HUD button 
+    var menuItemName = "HUD shield button";
+    Menu.addMenuItem({
+        menuName: "Settings",
+        menuItemName: menuItemName,
+        isCheckable: true,
+        isChecked: AvatarInputs.showBubbleTools
+    });
+    Menu.menuItemEvent.connect(onToggleHudShieldButton);
+    AvatarInputs.showBubbleToolsChanged.connect(showBubbleToolsChanged);
+
+    function onToggleHudShieldButton(menuItem) {
+        if (menuItem == menuItemName) {
+            AvatarInputs.setShowBubbleTools(Menu.isOptionChecked(menuItem))
+        };
+    }
+
+    function showBubbleToolsChanged(show) {
+        Menu.setIsOptionChecked(menuItemName, show);
+    }
+
     // Make the bubble overlay visible, set its position, and play the sound
     function createOverlays() {
         var nowTimestamp = Date.now();
@@ -191,6 +212,9 @@
 
     // Cleanup the tablet button and overlays when script is stopped
     Script.scriptEnding.connect(function () {
+        Menu.menuItemEvent.disconnect(onToggleHudShieldButton);
+        AvatarInputs.showBubbleToolsChanged.disconnect(showBubbleToolsChanged);
+        Menu.removeMenuItem("Settings", menuItemName);
         button.clicked.disconnect(Users.toggleIgnoreRadius);
         if (tablet) {
             tablet.removeButton(button);

From 481125f97857f78147c5a9024f2e5b143f649ce7 Mon Sep 17 00:00:00 2001
From: Martin Allerton <madders@gmail.com>
Date: Wed, 18 Aug 2021 23:54:23 +0100
Subject: [PATCH 22/27] Explore app metaverse api updates

Blended the metaverse api places data in to the list with the beacon data. Also lightened the icons at the top as they were a little lost.
---
 scripts/communityScripts/explore/explore.html | 138 +++++++++++++-----
 .../libraries/axios/axios.min.js              |   3 +
 2 files changed, 103 insertions(+), 38 deletions(-)
 create mode 100644 scripts/communityScripts/libraries/axios/axios.min.js

diff --git a/scripts/communityScripts/explore/explore.html b/scripts/communityScripts/explore/explore.html
index c147dba134..747e969daa 100644
--- a/scripts/communityScripts/explore/explore.html
+++ b/scripts/communityScripts/explore/explore.html
@@ -13,8 +13,18 @@
         #component-templates {
             display: none;
         }
+
+        .thumbnailItem .d-flex {
+            background: rgba(0, 0, 0, 0.2);
+            backdrop-filter: blur(5px);
+            text-shadow: 1px 1px 2px black, 0 0 25px black, 0 0 5px black;
+        }
+
+        .thumbnailItemHover .d-flex {
+            background: rgba(100, 100, 100, 0.2);
+        }
     </style>
-    <!--<script src="js/TestEventBridge.js"></script>-->
+    <!--<script src="../Explore/js/TestEventBridge.js"></script>-->
 </head>
 <body>
     <div id="component-templates">
@@ -22,7 +32,7 @@
             <v-dialog v-model="dialog" fullscreen hide-overlay transition="dialog-bottom-transition">
                 <template v-slot:activator="{ on, attrs }">
                     <v-btn color="grey darken-3" class="ml-5" v-show="permission" value="animations" v-bind="attrs" v-on="on" fab small>
-                        <v-icon color="purple">mdi-map-plus</v-icon>
+                        <v-icon color="purple lighten-2">mdi-map-plus</v-icon>
                     </v-btn>
                 </template>
                 <v-card>
@@ -30,7 +40,7 @@
                         <v-btn icon dark @click="closeDialog();">
                             <v-icon>mdi-close</v-icon>
                         </v-btn>
-                        <v-toolbar-title>Add Location</v-toolbar-title>
+                        <v-toolbar-title>Add Location Beacon</v-toolbar-title>
                         <v-spacer></v-spacer>
                         <v-toolbar-items>
                             <v-btn dark text @click="addLocation()">Save</v-btn>
@@ -101,30 +111,28 @@
                         <template v-slot:default="props">
                             <v-row dense>
                                 <v-col v-for="item in props.items"
-                                       :key="item.name"
+                                       :key="item.index"
                                        cols="12"
                                        sm="6"
                                        md="4"
                                        lg="3">
-                                   <v-hover
-                                       v-slot:default="{ hover }"
-                                   >
-                                        <v-card 
-                                            @click.native="openLocation(item['Visit'])"
-                                            :color="hover ? 'grey darken-3' : 'grey darken-4'"
-                                        >
-                                            <!--<v-card-title class="headline">{{ item["Domain Name"] }}</v-card-title>-->
+                                    <v-hover v-slot:default="{ hover }">
+                                        <v-card @click.native="openLocation(item['location'])"
+                                                :color="hover ? 'grey darken-3' : 'grey darken-4'"
+                                                 :style="item.thumbnail ? 'background-size: cover; background-position: center; background-image: url(' + item.thumbnail +');' : '' "
+                                                 :class="item.thumbnail ? (hover ? 'thumbnailItem thumbnailItemHover' : 'thumbnailItem') : '' "
+                                                >
                                             <div class="d-flex flex-no-wrap justify-space-between">
-                                                <div>
-                                                    <v-card-title class="text-h6 d-block text-truncate pa-2" v-text="item['Domain Name']" style="max-width: 400px;"></v-card-title>
-                                                    <v-card-subtitle class="pa-2 d-block text-truncate" style="max-width: 400px;" v-text="item.Owner"></v-card-subtitle>
-                                                </div>
-                                                <div style="text-align: right;">
-                                                    <v-card-title align-right class="align-right" v-text="item['People']"></v-card-title>
-                                                </div>
+                                                    <div>
+                                                        <v-card-title class="text-h6 d-block text-truncate pa-2" v-text="item['name']" style="max-width: 400px;"></v-card-title>
+                                                        <v-card-subtitle class="pa-2 d-block text-truncate" style="max-width: 400px;" v-text="item.owner"></v-card-subtitle>
+                                                    </div>
+                                                    <div style="text-align: right;">
+                                                        <v-card-title align-right class="align-right" v-text="item['userCount']"></v-card-title>
+                                                    </div>
                                             </div>
                                         </v-card>
-                                    </hover>
+                                    </v-hover>
                                 </v-col>
                             </v-row>
                         </template>
@@ -230,7 +238,7 @@
                     <v-tooltip bottom>
                         <template v-slot:activator="{ on, attrs }">
                             <v-btn v-bind="attrs" v-on="on" color="grey darken-3" class="mx-1" v-show="isHomeSet" value="animations" fab small @click="navigateHome()">
-                                <v-icon color="purple">mdi-home</v-icon>
+                                <v-icon color="purple lighten-2">mdi-home</v-icon>
                             </v-btn>
                         </template>
                         <span>Go Home</span>
@@ -238,7 +246,7 @@
                     <v-tooltip bottom>
                         <template v-slot:activator="{ on, attrs }">
                             <v-btn v-bind="attrs" v-on="on" color="grey darken-3" class="mx-1" value="animations" fab small @click="navigateBack()">
-                                <v-icon color="purple">mdi-arrow-left-bold</v-icon>
+                                <v-icon color="purple lighten-2">mdi-arrow-left-bold</v-icon>
                             </v-btn>
                         </template>
                         <span>Go Back</span>
@@ -246,14 +254,14 @@
                     <v-tooltip bottom>
                         <template v-slot:activator="{ on, attrs }">
                             <v-btn v-bind="attrs" v-on="on" color="grey darken-3" class="mx-1" value="animations" fab small @click="navigateForward()">
-                                <v-icon color="purple">mdi-arrow-right-bold</v-icon>
+                                <v-icon color="purple lighten-2">mdi-arrow-right-bold</v-icon>
                             </v-btn>
                         </template>
                         <span>Go Forward</span>
                     </v-tooltip>
                     <!--<v-btn value="animations" fab small>
-        <v-icon color="purple">mdi-map-marker-plus</v-icon>
-    </v-btn>-->
+                        <v-icon color="purple">mdi-map-marker-plus</v-icon>
+                    </v-btn>-->
                     <add-location ref="addLocation" :permission="permission"></add-location>
                 </v-app-bar>
             </div>
@@ -286,22 +294,76 @@
     <script src="../libraries/vue/vue.min.js"></script>
     <script src="../libraries/vue-router/vue-router.js"></script>
     <script src="../libraries/vuetify/vuetify-v2.3.9.js"></script>
+    <script src="../libraries/axios/axios.min.js"></script>
 
     <script>
         var exploreComponent = null;
         var locationData = null;
+        var placesData = null;
+
+        function blendedData() {
+            var joinedData = [];
+            if (locationData != null) {
+                for (var i = 0; i < locationData.length; i++) {
+                    joinedData.push({
+                        "index": joinedData.length
+                        , "location": locationData[i].Visit
+                        , "name": locationData[i]['Domain Name']
+                        , "owner": locationData[i].Owner
+                        , "userCount": locationData[i].People
+                        , "description": ""
+                        , "thumbnail": ""
+                    });
+                }
+            }
+
+            if (placesData != null) {
+                var activeThresholdTime = new Date();
+                activeThresholdTime.setMinutes(activeThresholdTime.getMinutes() - 15);
+
+                // while blending metaverse data ensure it is cleaned for active domains
+                for (var i = 0; i < placesData.length; i++) {
+                    if (placesData[i].domain.active && placesData[i].visibility == "open" && new Date(placesData[i].last_activity_update) > activeThresholdTime) {
+                        joinedData.push({
+                            "index": joinedData.length
+                            , "location": placesData[i].address
+                            , "name": placesData[i].name
+                            , "owner": placesData[i].managers[0]
+                            , "userCount": placesData[i].current_attendance
+                            , "description": placesData[i].description
+                            , "thumbnail": placesData[i].thumbnail
+                        });
+                    }
+                }
+            }
+
+            return joinedData;
+        }
+
         function getAddressListData(component) {
             exploreComponent = component;
 
-            if (locationData != null) {
-                exploreComponent.updateData(locationData);
-                return;
+            // if json data not loaded fire emti event for it
+            if (locationData == null) {
+                var readyEvent = {
+                    "action": "requestAddressList",
+                };
+                EventBridge.emitWebEvent(JSON.stringify(readyEvent));
             }
 
-            var readyEvent = {
-                "action": "requestAddressList",
-            };
-            EventBridge.emitWebEvent(JSON.stringify(readyEvent));
+            // if metaverse data not loaded fire a request for it
+            if (placesData == null) {
+                // TODO: fire off data get against the metaverse
+                axios.get("https://metaverse.vircadia.com/live/api/v1/places")
+                    .then((response) => {
+                        placesData = response.data.data.places;
+
+                        exploreComponent.updateData(blendedData());
+                    })
+                    .catch(function (error) {
+                        console.log(error);
+                    });
+            }
         }
 
         var bookmarksComponent = null;
@@ -346,8 +408,8 @@
                     page: 1,
                     pageCount: 0,
                     itemsPerPage: 6,
-                    sortBy: 'People',
-                    items: [], 
+                    sortBy: 'userCount',
+                    items: [],
                 }
             },
             template: document.getElementById("explore-template").innerHTML,
@@ -544,7 +606,7 @@
                     if (messageData.action == "addressListv2") {
                         self.permission = messageData.permission;
                         locationData = messageData.myAddress;
-                        exploreComponent.updateData(locationData);
+                        exploreComponent.updateData(blendedData());
                         self.isHomeSet = messageData.isHomeSet;
                     }
                     if (messageData.action == "bookmarksList") {
@@ -553,9 +615,9 @@
                     }
                     if (messageData.action == "retrievePortInformationResponse") {
                         addLocationData = messageData.goToAddresses;
-                        for (let i = 0; i < addLocationData.length; i++) {	
-                            var metaverseProvider = addLocationData[i].split("/")[2].split(":")[0];	
-                            addLocationData[i] = "https://" + metaverseProvider + "/interim/d-goto/app/decentralizedGoToServerScript.js";	
+                        for (let i = 0; i < addLocationData.length; i++) {
+                            var metaverseProvider = addLocationData[i].split("/")[2].split(":")[0];
+                            addLocationData[i] = "https://" + metaverseProvider + "/interim/d-goto/app/decentralizedGoToServerScript.js";
                         }
                         addLocationComponent.updateData(addLocationData);
                     }
diff --git a/scripts/communityScripts/libraries/axios/axios.min.js b/scripts/communityScripts/libraries/axios/axios.min.js
new file mode 100644
index 0000000000..fc6c8b6187
--- /dev/null
+++ b/scripts/communityScripts/libraries/axios/axios.min.js
@@ -0,0 +1,3 @@
+/* axios v0.21.1 | (c) 2020 by Matt Zabriskie */
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.axios=t():e.axios=t()}(this,function(){return function(e){function t(r){if(n[r])return n[r].exports;var o=n[r]={exports:{},id:r,loaded:!1};return e[r].call(o.exports,o,o.exports,t),o.loaded=!0,o.exports}var n={};return t.m=e,t.c=n,t.p="",t(0)}([function(e,t,n){e.exports=n(1)},function(e,t,n){"use strict";function r(e){var t=new i(e),n=s(i.prototype.request,t);return o.extend(n,i.prototype,t),o.extend(n,t),n}var o=n(2),s=n(3),i=n(4),a=n(22),u=n(10),c=r(u);c.Axios=i,c.create=function(e){return r(a(c.defaults,e))},c.Cancel=n(23),c.CancelToken=n(24),c.isCancel=n(9),c.all=function(e){return Promise.all(e)},c.spread=n(25),c.isAxiosError=n(26),e.exports=c,e.exports.default=c},function(e,t,n){"use strict";function r(e){return"[object Array]"===R.call(e)}function o(e){return"undefined"==typeof e}function s(e){return null!==e&&!o(e)&&null!==e.constructor&&!o(e.constructor)&&"function"==typeof e.constructor.isBuffer&&e.constructor.isBuffer(e)}function i(e){return"[object ArrayBuffer]"===R.call(e)}function a(e){return"undefined"!=typeof FormData&&e instanceof FormData}function u(e){var t;return t="undefined"!=typeof ArrayBuffer&&ArrayBuffer.isView?ArrayBuffer.isView(e):e&&e.buffer&&e.buffer instanceof ArrayBuffer}function c(e){return"string"==typeof e}function f(e){return"number"==typeof e}function p(e){return null!==e&&"object"==typeof e}function d(e){if("[object Object]"!==R.call(e))return!1;var t=Object.getPrototypeOf(e);return null===t||t===Object.prototype}function l(e){return"[object Date]"===R.call(e)}function h(e){return"[object File]"===R.call(e)}function m(e){return"[object Blob]"===R.call(e)}function y(e){return"[object Function]"===R.call(e)}function g(e){return p(e)&&y(e.pipe)}function v(e){return"undefined"!=typeof URLSearchParams&&e instanceof URLSearchParams}function x(e){return e.replace(/^\s*/,"").replace(/\s*$/,"")}function w(){return("undefined"==typeof navigator||"ReactNative"!==navigator.product&&"NativeScript"!==navigator.product&&"NS"!==navigator.product)&&("undefined"!=typeof window&&"undefined"!=typeof document)}function b(e,t){if(null!==e&&"undefined"!=typeof e)if("object"!=typeof e&&(e=[e]),r(e))for(var n=0,o=e.length;n<o;n++)t.call(null,e[n],n,e);else for(var s in e)Object.prototype.hasOwnProperty.call(e,s)&&t.call(null,e[s],s,e)}function E(){function e(e,n){d(t[n])&&d(e)?t[n]=E(t[n],e):d(e)?t[n]=E({},e):r(e)?t[n]=e.slice():t[n]=e}for(var t={},n=0,o=arguments.length;n<o;n++)b(arguments[n],e);return t}function j(e,t,n){return b(t,function(t,r){n&&"function"==typeof t?e[r]=S(t,n):e[r]=t}),e}function C(e){return 65279===e.charCodeAt(0)&&(e=e.slice(1)),e}var S=n(3),R=Object.prototype.toString;e.exports={isArray:r,isArrayBuffer:i,isBuffer:s,isFormData:a,isArrayBufferView:u,isString:c,isNumber:f,isObject:p,isPlainObject:d,isUndefined:o,isDate:l,isFile:h,isBlob:m,isFunction:y,isStream:g,isURLSearchParams:v,isStandardBrowserEnv:w,forEach:b,merge:E,extend:j,trim:x,stripBOM:C}},function(e,t){"use strict";e.exports=function(e,t){return function(){for(var n=new Array(arguments.length),r=0;r<n.length;r++)n[r]=arguments[r];return e.apply(t,n)}}},function(e,t,n){"use strict";function r(e){this.defaults=e,this.interceptors={request:new i,response:new i}}var o=n(2),s=n(5),i=n(6),a=n(7),u=n(22);r.prototype.request=function(e){"string"==typeof e?(e=arguments[1]||{},e.url=arguments[0]):e=e||{},e=u(this.defaults,e),e.method?e.method=e.method.toLowerCase():this.defaults.method?e.method=this.defaults.method.toLowerCase():e.method="get";var t=[a,void 0],n=Promise.resolve(e);for(this.interceptors.request.forEach(function(e){t.unshift(e.fulfilled,e.rejected)}),this.interceptors.response.forEach(function(e){t.push(e.fulfilled,e.rejected)});t.length;)n=n.then(t.shift(),t.shift());return n},r.prototype.getUri=function(e){return e=u(this.defaults,e),s(e.url,e.params,e.paramsSerializer).replace(/^\?/,"")},o.forEach(["delete","get","head","options"],function(e){r.prototype[e]=function(t,n){return this.request(u(n||{},{method:e,url:t,data:(n||{}).data}))}}),o.forEach(["post","put","patch"],function(e){r.prototype[e]=function(t,n,r){return this.request(u(r||{},{method:e,url:t,data:n}))}}),e.exports=r},function(e,t,n){"use strict";function r(e){return encodeURIComponent(e).replace(/%3A/gi,":").replace(/%24/g,"$").replace(/%2C/gi,",").replace(/%20/g,"+").replace(/%5B/gi,"[").replace(/%5D/gi,"]")}var o=n(2);e.exports=function(e,t,n){if(!t)return e;var s;if(n)s=n(t);else if(o.isURLSearchParams(t))s=t.toString();else{var i=[];o.forEach(t,function(e,t){null!==e&&"undefined"!=typeof e&&(o.isArray(e)?t+="[]":e=[e],o.forEach(e,function(e){o.isDate(e)?e=e.toISOString():o.isObject(e)&&(e=JSON.stringify(e)),i.push(r(t)+"="+r(e))}))}),s=i.join("&")}if(s){var a=e.indexOf("#");a!==-1&&(e=e.slice(0,a)),e+=(e.indexOf("?")===-1?"?":"&")+s}return e}},function(e,t,n){"use strict";function r(){this.handlers=[]}var o=n(2);r.prototype.use=function(e,t){return this.handlers.push({fulfilled:e,rejected:t}),this.handlers.length-1},r.prototype.eject=function(e){this.handlers[e]&&(this.handlers[e]=null)},r.prototype.forEach=function(e){o.forEach(this.handlers,function(t){null!==t&&e(t)})},e.exports=r},function(e,t,n){"use strict";function r(e){e.cancelToken&&e.cancelToken.throwIfRequested()}var o=n(2),s=n(8),i=n(9),a=n(10);e.exports=function(e){r(e),e.headers=e.headers||{},e.data=s(e.data,e.headers,e.transformRequest),e.headers=o.merge(e.headers.common||{},e.headers[e.method]||{},e.headers),o.forEach(["delete","get","head","post","put","patch","common"],function(t){delete e.headers[t]});var t=e.adapter||a.adapter;return t(e).then(function(t){return r(e),t.data=s(t.data,t.headers,e.transformResponse),t},function(t){return i(t)||(r(e),t&&t.response&&(t.response.data=s(t.response.data,t.response.headers,e.transformResponse))),Promise.reject(t)})}},function(e,t,n){"use strict";var r=n(2);e.exports=function(e,t,n){return r.forEach(n,function(n){e=n(e,t)}),e}},function(e,t){"use strict";e.exports=function(e){return!(!e||!e.__CANCEL__)}},function(e,t,n){"use strict";function r(e,t){!s.isUndefined(e)&&s.isUndefined(e["Content-Type"])&&(e["Content-Type"]=t)}function o(){var e;return"undefined"!=typeof XMLHttpRequest?e=n(12):"undefined"!=typeof process&&"[object process]"===Object.prototype.toString.call(process)&&(e=n(12)),e}var s=n(2),i=n(11),a={"Content-Type":"application/x-www-form-urlencoded"},u={adapter:o(),transformRequest:[function(e,t){return i(t,"Accept"),i(t,"Content-Type"),s.isFormData(e)||s.isArrayBuffer(e)||s.isBuffer(e)||s.isStream(e)||s.isFile(e)||s.isBlob(e)?e:s.isArrayBufferView(e)?e.buffer:s.isURLSearchParams(e)?(r(t,"application/x-www-form-urlencoded;charset=utf-8"),e.toString()):s.isObject(e)?(r(t,"application/json;charset=utf-8"),JSON.stringify(e)):e}],transformResponse:[function(e){if("string"==typeof e)try{e=JSON.parse(e)}catch(e){}return e}],timeout:0,xsrfCookieName:"XSRF-TOKEN",xsrfHeaderName:"X-XSRF-TOKEN",maxContentLength:-1,maxBodyLength:-1,validateStatus:function(e){return e>=200&&e<300}};u.headers={common:{Accept:"application/json, text/plain, */*"}},s.forEach(["delete","get","head"],function(e){u.headers[e]={}}),s.forEach(["post","put","patch"],function(e){u.headers[e]=s.merge(a)}),e.exports=u},function(e,t,n){"use strict";var r=n(2);e.exports=function(e,t){r.forEach(e,function(n,r){r!==t&&r.toUpperCase()===t.toUpperCase()&&(e[t]=n,delete e[r])})}},function(e,t,n){"use strict";var r=n(2),o=n(13),s=n(16),i=n(5),a=n(17),u=n(20),c=n(21),f=n(14);e.exports=function(e){return new Promise(function(t,n){var p=e.data,d=e.headers;r.isFormData(p)&&delete d["Content-Type"];var l=new XMLHttpRequest;if(e.auth){var h=e.auth.username||"",m=e.auth.password?unescape(encodeURIComponent(e.auth.password)):"";d.Authorization="Basic "+btoa(h+":"+m)}var y=a(e.baseURL,e.url);if(l.open(e.method.toUpperCase(),i(y,e.params,e.paramsSerializer),!0),l.timeout=e.timeout,l.onreadystatechange=function(){if(l&&4===l.readyState&&(0!==l.status||l.responseURL&&0===l.responseURL.indexOf("file:"))){var r="getAllResponseHeaders"in l?u(l.getAllResponseHeaders()):null,s=e.responseType&&"text"!==e.responseType?l.response:l.responseText,i={data:s,status:l.status,statusText:l.statusText,headers:r,config:e,request:l};o(t,n,i),l=null}},l.onabort=function(){l&&(n(f("Request aborted",e,"ECONNABORTED",l)),l=null)},l.onerror=function(){n(f("Network Error",e,null,l)),l=null},l.ontimeout=function(){var t="timeout of "+e.timeout+"ms exceeded";e.timeoutErrorMessage&&(t=e.timeoutErrorMessage),n(f(t,e,"ECONNABORTED",l)),l=null},r.isStandardBrowserEnv()){var g=(e.withCredentials||c(y))&&e.xsrfCookieName?s.read(e.xsrfCookieName):void 0;g&&(d[e.xsrfHeaderName]=g)}if("setRequestHeader"in l&&r.forEach(d,function(e,t){"undefined"==typeof p&&"content-type"===t.toLowerCase()?delete d[t]:l.setRequestHeader(t,e)}),r.isUndefined(e.withCredentials)||(l.withCredentials=!!e.withCredentials),e.responseType)try{l.responseType=e.responseType}catch(t){if("json"!==e.responseType)throw t}"function"==typeof e.onDownloadProgress&&l.addEventListener("progress",e.onDownloadProgress),"function"==typeof e.onUploadProgress&&l.upload&&l.upload.addEventListener("progress",e.onUploadProgress),e.cancelToken&&e.cancelToken.promise.then(function(e){l&&(l.abort(),n(e),l=null)}),p||(p=null),l.send(p)})}},function(e,t,n){"use strict";var r=n(14);e.exports=function(e,t,n){var o=n.config.validateStatus;n.status&&o&&!o(n.status)?t(r("Request failed with status code "+n.status,n.config,null,n.request,n)):e(n)}},function(e,t,n){"use strict";var r=n(15);e.exports=function(e,t,n,o,s){var i=new Error(e);return r(i,t,n,o,s)}},function(e,t){"use strict";e.exports=function(e,t,n,r,o){return e.config=t,n&&(e.code=n),e.request=r,e.response=o,e.isAxiosError=!0,e.toJSON=function(){return{message:this.message,name:this.name,description:this.description,number:this.number,fileName:this.fileName,lineNumber:this.lineNumber,columnNumber:this.columnNumber,stack:this.stack,config:this.config,code:this.code}},e}},function(e,t,n){"use strict";var r=n(2);e.exports=r.isStandardBrowserEnv()?function(){return{write:function(e,t,n,o,s,i){var a=[];a.push(e+"="+encodeURIComponent(t)),r.isNumber(n)&&a.push("expires="+new Date(n).toGMTString()),r.isString(o)&&a.push("path="+o),r.isString(s)&&a.push("domain="+s),i===!0&&a.push("secure"),document.cookie=a.join("; ")},read:function(e){var t=document.cookie.match(new RegExp("(^|;\\s*)("+e+")=([^;]*)"));return t?decodeURIComponent(t[3]):null},remove:function(e){this.write(e,"",Date.now()-864e5)}}}():function(){return{write:function(){},read:function(){return null},remove:function(){}}}()},function(e,t,n){"use strict";var r=n(18),o=n(19);e.exports=function(e,t){return e&&!r(t)?o(e,t):t}},function(e,t){"use strict";e.exports=function(e){return/^([a-z][a-z\d\+\-\.]*:)?\/\//i.test(e)}},function(e,t){"use strict";e.exports=function(e,t){return t?e.replace(/\/+$/,"")+"/"+t.replace(/^\/+/,""):e}},function(e,t,n){"use strict";var r=n(2),o=["age","authorization","content-length","content-type","etag","expires","from","host","if-modified-since","if-unmodified-since","last-modified","location","max-forwards","proxy-authorization","referer","retry-after","user-agent"];e.exports=function(e){var t,n,s,i={};return e?(r.forEach(e.split("\n"),function(e){if(s=e.indexOf(":"),t=r.trim(e.substr(0,s)).toLowerCase(),n=r.trim(e.substr(s+1)),t){if(i[t]&&o.indexOf(t)>=0)return;"set-cookie"===t?i[t]=(i[t]?i[t]:[]).concat([n]):i[t]=i[t]?i[t]+", "+n:n}}),i):i}},function(e,t,n){"use strict";var r=n(2);e.exports=r.isStandardBrowserEnv()?function(){function e(e){var t=e;return n&&(o.setAttribute("href",t),t=o.href),o.setAttribute("href",t),{href:o.href,protocol:o.protocol?o.protocol.replace(/:$/,""):"",host:o.host,search:o.search?o.search.replace(/^\?/,""):"",hash:o.hash?o.hash.replace(/^#/,""):"",hostname:o.hostname,port:o.port,pathname:"/"===o.pathname.charAt(0)?o.pathname:"/"+o.pathname}}var t,n=/(msie|trident)/i.test(navigator.userAgent),o=document.createElement("a");return t=e(window.location.href),function(n){var o=r.isString(n)?e(n):n;return o.protocol===t.protocol&&o.host===t.host}}():function(){return function(){return!0}}()},function(e,t,n){"use strict";var r=n(2);e.exports=function(e,t){function n(e,t){return r.isPlainObject(e)&&r.isPlainObject(t)?r.merge(e,t):r.isPlainObject(t)?r.merge({},t):r.isArray(t)?t.slice():t}function o(o){r.isUndefined(t[o])?r.isUndefined(e[o])||(s[o]=n(void 0,e[o])):s[o]=n(e[o],t[o])}t=t||{};var s={},i=["url","method","data"],a=["headers","auth","proxy","params"],u=["baseURL","transformRequest","transformResponse","paramsSerializer","timeout","timeoutMessage","withCredentials","adapter","responseType","xsrfCookieName","xsrfHeaderName","onUploadProgress","onDownloadProgress","decompress","maxContentLength","maxBodyLength","maxRedirects","transport","httpAgent","httpsAgent","cancelToken","socketPath","responseEncoding"],c=["validateStatus"];r.forEach(i,function(e){r.isUndefined(t[e])||(s[e]=n(void 0,t[e]))}),r.forEach(a,o),r.forEach(u,function(o){r.isUndefined(t[o])?r.isUndefined(e[o])||(s[o]=n(void 0,e[o])):s[o]=n(void 0,t[o])}),r.forEach(c,function(r){r in t?s[r]=n(e[r],t[r]):r in e&&(s[r]=n(void 0,e[r]))});var f=i.concat(a).concat(u).concat(c),p=Object.keys(e).concat(Object.keys(t)).filter(function(e){return f.indexOf(e)===-1});return r.forEach(p,o),s}},function(e,t){"use strict";function n(e){this.message=e}n.prototype.toString=function(){return"Cancel"+(this.message?": "+this.message:"")},n.prototype.__CANCEL__=!0,e.exports=n},function(e,t,n){"use strict";function r(e){if("function"!=typeof e)throw new TypeError("executor must be a function.");var t;this.promise=new Promise(function(e){t=e});var n=this;e(function(e){n.reason||(n.reason=new o(e),t(n.reason))})}var o=n(23);r.prototype.throwIfRequested=function(){if(this.reason)throw this.reason},r.source=function(){var e,t=new r(function(t){e=t});return{token:t,cancel:e}},e.exports=r},function(e,t){"use strict";e.exports=function(e){return function(t){return e.apply(null,t)}}},function(e,t){"use strict";e.exports=function(e){return"object"==typeof e&&e.isAxiosError===!0}}])});
+//# sourceMappingURL=axios.min.map
\ No newline at end of file

From bb1884b361ab44b4d3003c4ac0ad2945a592da70 Mon Sep 17 00:00:00 2001
From: Dale Glass <dale@daleglass.net>
Date: Sun, 15 Aug 2021 19:09:13 +0200
Subject: [PATCH 23/27] Copy resources to interface's exe directory

This should have no effect on Unix, but fix the resource issue on Win32
---
 interface/CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 10489eb57b..9d8fd93f20 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -394,6 +394,9 @@ else()
     COMMAND "${CMAKE_COMMAND}" -E copy_if_different
       "${PROJECT_SOURCE_DIR}/resources/serverless/redirect.json"
       "${RESOURCES_DEV_DIR}/serverless/redirect.json"
+    COMMAND "${CMAKE_COMMAND}" -E copy_if_different
+      "${RESOURCES_RCC}"
+      "${INTERFACE_EXEC_DIR}/resources.rcc"
   )
 
   if (JSDOC_ENABLED)

From a7dee4bb8ab936fb8651da2bbf36bfd7c9c30e6a Mon Sep 17 00:00:00 2001
From: SilverfishVR <53531160+SilverfishVR@users.noreply.github.com>
Date: Sat, 21 Aug 2021 17:54:10 +0200
Subject: [PATCH 24/27] Apply suggestions from code review

Co-authored-by: David Rowe <david@ctrlaltstudio.com>
---
 scripts/system/bubble.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/system/bubble.js b/scripts/system/bubble.js
index 0c019f4e4b..260bbaa4bf 100644
--- a/scripts/system/bubble.js
+++ b/scripts/system/bubble.js
@@ -58,8 +58,8 @@
     AvatarInputs.showBubbleToolsChanged.connect(showBubbleToolsChanged);
 
     function onToggleHudShieldButton(menuItem) {
-        if (menuItem == menuItemName) {
-            AvatarInputs.setShowBubbleTools(Menu.isOptionChecked(menuItem))
+        if (menuItem === menuItemName) {
+            AvatarInputs.setShowBubbleTools(Menu.isOptionChecked(menuItem));
         };
     }
 

From 1a02b918d755a38d2c8cfe544a3e27d784e6e85e Mon Sep 17 00:00:00 2001
From: Martin Allerton <madders@gmail.com>
Date: Sat, 21 Aug 2021 23:05:11 +0100
Subject: [PATCH 25/27] formatting changes and added axios license

Updates following comment from ctrlaltdavid
---
 scripts/communityScripts/explore/explore.html | 31 +++++++++----------
 .../communityScripts/libraries/axios/LICENSE  | 19 ++++++++++++
 2 files changed, 34 insertions(+), 16 deletions(-)
 create mode 100644 scripts/communityScripts/libraries/axios/LICENSE

diff --git a/scripts/communityScripts/explore/explore.html b/scripts/communityScripts/explore/explore.html
index 747e969daa..51f2045915 100644
--- a/scripts/communityScripts/explore/explore.html
+++ b/scripts/communityScripts/explore/explore.html
@@ -306,13 +306,13 @@
             if (locationData != null) {
                 for (var i = 0; i < locationData.length; i++) {
                     joinedData.push({
-                        "index": joinedData.length
-                        , "location": locationData[i].Visit
-                        , "name": locationData[i]['Domain Name']
-                        , "owner": locationData[i].Owner
-                        , "userCount": locationData[i].People
-                        , "description": ""
-                        , "thumbnail": ""
+                        "index": joinedData.length, 
+                        "location": locationData[i].Visit, 
+                        "name": locationData[i]['Domain Name'], 
+                        "owner": locationData[i].Owner, 
+                        "userCount": locationData[i].People, 
+                        "description": "", 
+                        "thumbnail": ""
                     });
                 }
             }
@@ -325,13 +325,13 @@
                 for (var i = 0; i < placesData.length; i++) {
                     if (placesData[i].domain.active && placesData[i].visibility == "open" && new Date(placesData[i].last_activity_update) > activeThresholdTime) {
                         joinedData.push({
-                            "index": joinedData.length
-                            , "location": placesData[i].address
-                            , "name": placesData[i].name
-                            , "owner": placesData[i].managers[0]
-                            , "userCount": placesData[i].current_attendance
-                            , "description": placesData[i].description
-                            , "thumbnail": placesData[i].thumbnail
+                            "index": joinedData.length,
+                            "location": placesData[i].address,
+                            "name": placesData[i].name,
+                            "owner": placesData[i].managers[0],
+                            "userCount": placesData[i].current_attendance,
+                            "description": placesData[i].description,
+                            "thumbnail": placesData[i].thumbnail
                         });
                     }
                 }
@@ -353,11 +353,10 @@
 
             // if metaverse data not loaded fire a request for it
             if (placesData == null) {
-                // TODO: fire off data get against the metaverse
+                // fire off data get against the metaverse
                 axios.get("https://metaverse.vircadia.com/live/api/v1/places")
                     .then((response) => {
                         placesData = response.data.data.places;
-
                         exploreComponent.updateData(blendedData());
                     })
                     .catch(function (error) {
diff --git a/scripts/communityScripts/libraries/axios/LICENSE b/scripts/communityScripts/libraries/axios/LICENSE
new file mode 100644
index 0000000000..2d8d66aa4e
--- /dev/null
+++ b/scripts/communityScripts/libraries/axios/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2014-present Matt Zabriskie
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
\ No newline at end of file

From 4d21cedf9ddc5717237284ed23951a53036f1231 Mon Sep 17 00:00:00 2001
From: SilverfishVR <53531160+SilverfishVR@users.noreply.github.com>
Date: Sun, 22 Aug 2021 10:04:37 +0200
Subject: [PATCH 26/27] Update menu item name

Co-authored-by: Kalila <69767640+digisomni@users.noreply.github.com>
---
 scripts/system/bubble.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/system/bubble.js b/scripts/system/bubble.js
index 260bbaa4bf..88dee88d62 100644
--- a/scripts/system/bubble.js
+++ b/scripts/system/bubble.js
@@ -47,7 +47,7 @@
     }
 
     //create a menu item in "Setings" to toggle the bubble/shield HUD button 
-    var menuItemName = "HUD shield button";
+    var menuItemName = "HUD Shield Button";
     Menu.addMenuItem({
         menuName: "Settings",
         menuItemName: menuItemName,

From 113915637b5d25069584890a062499b40df5d180 Mon Sep 17 00:00:00 2001
From: Alezia Kurdis <60075796+AleziaKurdis@users.noreply.github.com>
Date: Mon, 23 Aug 2021 23:28:31 -0400
Subject: [PATCH 27/27] Adjustment to solve red button css.

Added the red class to the Reset Rotation button.
---
 .../system/create/entityProperties/html/js/entityProperties.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/system/create/entityProperties/html/js/entityProperties.js b/scripts/system/create/entityProperties/html/js/entityProperties.js
index ff538af016..5a20ae6f20 100644
--- a/scripts/system/create/entityProperties/html/js/entityProperties.js
+++ b/scripts/system/create/entityProperties/html/js/entityProperties.js
@@ -1384,7 +1384,7 @@ const GROUPS = [
                 type: "buttons",
                 buttons: [  { id: "copyRotation", label: "Copy Rotation", className: "secondary", onClick: copyRotationProperty },
                             { id: "pasteRotation", label: "Paste Rotation", className: "secondary", onClick: pasteRotationProperty },
-                            { id: "setRotationToZero", label: "Reset Rotation", className: "secondary_red", onClick: setRotationToZeroProperty }],
+                            { id: "setRotationToZero", label: "Reset Rotation", className: "secondary_red red", onClick: setRotationToZeroProperty }],
                 propertyID: "copyPasteRotation"
             },          
             {