Merge branch 'master' into remove-hifiac

2025-04-05 18:19:26 +02:00 · 2022-01-23 14:03:02 +01:00 · 2022-01-23 14:03:02 +01:00 · df68f5c8eb
commit df68f5c8eb
parent ee7781165c 7c91ceba06
428 changed files with 17440 additions and 1732 deletions
--- a/.github/workflows/master_build.yml
+++ b/.github/workflows/master_build.yml
@ -1,6 +1,6 @@
 name: Master CI Build

-on: 
+on:
  push:
    branches:
      - master
@ -20,7 +20,9 @@ env:

  # OSX-specific variables
  DEVELOPER_DIR: /Applications/Xcode_11.2.app/Contents/Developer
-  MACOSX_DEPLOYMENT_TARGET: '10.11'
+  # We are using macOS SDK 10.12 to work around a lot of OpenGL issues in newer SDKs.
+  # There are crashes on startup, crashes on window resize, etc. on newer macOS SDKs.
+  MACOSX_DEPLOYMENT_TARGET: '10.12'

  # WIN-specific variables
  PreferredToolArchitecture: X64
@ -29,7 +31,7 @@ jobs:
  build:
    strategy:
      matrix:
-        os: [windows-latest, macOS-latest, ubuntu-18.04]
+        os: [windows-latest, macOS-10.15, ubuntu-18.04]
        # build_type: [full, client]
        build_type: [full]
        include:
@ -56,15 +58,15 @@ jobs:
          echo "PYTHON_EXEC=python3" >> $GITHUB_ENV
          echo "INSTALLER_EXT=tgz" >> $GITHUB_ENV
          echo "CMAKE_BUILD_EXTRA=-- -j3" >> $GITHUB_ENV
-          echo "CMAKE_EXTRA=-DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV
+          echo "CMAKE_EXTRA=-DVIRCADIA_CPU_ARCHITECTURE= -DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV
        fi
        # Mac build variables
-        if [ "${{ matrix.os }}" = "macOS-latest" ]; then
+        if [ "${{ matrix.os }}" = "macOS-10.15" ]; then
          echo "PYTHON_EXEC=python3" >> $GITHUB_ENV
          echo "ZIP_COMMAND=zip" >> $GITHUB_ENV
          echo "ZIP_ARGS=-r" >> $GITHUB_ENV
          echo "INSTALLER_EXT=dmg" >> $GITHUB_ENV
-          echo "CMAKE_EXTRA=-DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=OFF -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -G Xcode" >> $GITHUB_ENV
+          echo "CMAKE_EXTRA=-DVIRCADIA_CPU_ARCHITECTURE= -DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=OFF -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOPENSSL_LIBRARIES=/usr/local/opt/openssl/lib -G Xcode" >> $GITHUB_ENV
          echo "::set-output name=symbols_archive::${BUILD_NUMBER}-${{ matrix.build_type }}-mac-symbols.zip"
          echo "APP_TARGET_NAME=Vircadia" >> $GITHUB_ENV
        fi
@ -104,43 +106,75 @@ jobs:
      with:
        submodules: false
        fetch-depth: 1
+
    - name: Install dependencies
-      if: startsWith(matrix.os, 'ubuntu')
      shell: bash
+      if: startsWith(matrix.os, 'ubuntu') || contains(matrix.os, 'debian') || startsWith(matrix.os, 'macOS')
      run: |
-        echo "Installing Python Modules:"
-        pip3 install distro || exit 1
-        echo "Updating apt repository index"
-        sudo apt update || exit 1
-        echo "Installing apt packages"
-        sudo apt install -y ${{ matrix.apt-dependencies }} || exit 1
+        if [[ "${{ matrix.os }}" =~ "ubuntu" || "${{ matrix.os }}" =~ "debian" ]]; then
+          echo "Installing Python Modules:"
+          pip3 install distro || exit 1
+
+          echo "Updating apt repository index"
+          sudo apt update || exit 1
+
+          echo "Installing apt packages"
+          sudo apt install -y ${{ matrix.apt-dependencies }} || exit 1
+        else # macOS
+          echo "Downloading MacOSX10.12 SDK.."
+          curl --progress-bar -L -o macOS_SDK10.12.4.tar.xz "https://cloudflare-ipfs.com/ipfs/QmTDLEYdo616YgZKSYC2mySSw8EKQWTz7CH8UyMupMBpzK?filename=macOS_SDK10.12.4.tar.xz" || exit 1
+          echo "  done\n"
+          echo "Checking MacOSX10.12 SDK.."
+          echo "c00e03cb64bed8d0d75d7a01c93de094b6ffaa3bc3318e7b29a9bdc354f0e29e363c454b7db89db8a3b78e9702668d1c661f1af279807de8db11accecb0ca498  macOS_SDK10.12.4.tar.xz" >> macOS_SDK10.12.4.tar.xz.checksum
+          shasum -a 512 -w -c macOS_SDK10.12.4.tar.xz.checksum
+          echo "Extracting MacOSX10.12 SDK.."
+          tar -xf macOS_SDK10.12.4.tar.xz || exit 1
+          echo "  done\n"
+          echo "Installing MacOSX10.12 SDK.."
+          # cp always sets an error code while copying the SDK so we return 0 when that happens.
+          sudo cp -rp MacOSX10.12.sdk /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/ || exit 0
+          echo "  done"
+        fi
+
+    - name: Override NSIS
+      shell: pwsh
+      if: startsWith(matrix.os, 'windows')
+      run: choco install nsis --version=3.06.1
+
    - name: Install Python modules
      if: startsWith(matrix.os, 'windows') || startsWith(matrix.os, 'macOS')
      shell: bash
      run: $PYTHON_EXEC -m pip install boto3 PyGithub
+
    - name: Create build environment
      shell: bash
      run: cmake -E make_directory "${{runner.workspace}}/build"
+
    - name: Configure CMake
      working-directory: ${{runner.workspace}}/build
      shell: bash
      run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DVCPKG_BUILD_TYPE=release -DCLIENT_ONLY:BOOLEAN=$CLIENT_ONLY -DBYPASS_SIGNING:BOOLEAN=TRUE $CMAKE_EXTRA
+
    - name: Build application
      working-directory: ${{runner.workspace}}/build
      shell: bash
      run: cmake --build . --config $BUILD_TYPE --target $APP_TARGET_NAME $CMAKE_BUILD_EXTRA
+
    - name: Build domain server
      working-directory: ${{runner.workspace}}/build
      shell: bash
      run: cmake --build . --config $BUILD_TYPE --target domain-server $CMAKE_BUILD_EXTRA
+
    - name: Build assignment client
      working-directory: ${{runner.workspace}}/build
      shell: bash
      run: cmake --build . --config $BUILD_TYPE --target assignment-client $CMAKE_BUILD_EXTRA
+
    - name: Build console
      working-directory: ${{runner.workspace}}/build
      shell: bash
      run: cmake --build . --config $BUILD_TYPE --target packaged-server-console $CMAKE_BUILD_EXTRA
+
    - name: Build installer
      working-directory: ${{runner.workspace}}/build
      shell: bash
@ -167,11 +201,13 @@ jobs:
          done
        }
        retry cmake --build . --config $BUILD_TYPE --target package $CMAKE_BUILD_EXTRA
+
    #- name: Sign installer (Windows)
    #  if: startsWith(matrix.os, 'windows')
    #  shell: powershell
    #  working-directory: C:\Program Files (x86)\Windows Kits\10\bin\10.0.18362.0\x64
    #  run: .\signtool.exe sign /fd sha256 /f ${{runner.workspace}}\build\codesign.pfx /p ${{secrets.pfx_key}} /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /td SHA256 ${{runner.workspace}}\build\${env:INSTALLER}
+
    - name: Output system stats
      if: ${{ always() }}
      working-directory: ${{runner.workspace}}/build
@ -179,19 +215,22 @@ jobs:
      run: |
        echo "Disk usage:"
        df -h
+
    - name: Output installer logs
      if: failure() && startsWith(matrix.os, 'windows')
      shell: bash
      working-directory: ${{runner.workspace}}/build
      run: cat ./_CPack_Packages/win64/NSIS/NSISOutput.log
+
    - name: Upload artifact
      if: startsWith(matrix.os, 'windows') || startsWith(matrix.os, 'macOS')
      shell: bash
-      working-directory: ${{runner.workspace}}/build	
-      env:	
+      working-directory: ${{runner.workspace}}/build
+      env:
        AWS_ACCESS_KEY_ID: ${{ secrets.aws_access_key_id }}
-        AWS_SECRET_ACCESS_KEY: ${{ secrets.aws_secret_access_key }}	
-      run: $PYTHON_EXEC $GITHUB_WORKSPACE/tools/ci-scripts/upload.py 
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.aws_secret_access_key }}
+      run: $PYTHON_EXEC $GITHUB_WORKSPACE/tools/ci-scripts/upload.py
+
    #- name: Archive symbols
    #  if: startsWith(matrix.os, 'windows') || startsWith(matrix.os, 'macOS')
    #  working-directory: ${{runner.workspace}}
--- a/.github/workflows/pr_build.yml
+++ b/.github/workflows/pr_build.yml
@ -20,7 +20,9 @@ env:

  # OSX specific variables
  DEVELOPER_DIR: /Applications/Xcode_11.2.app/Contents/Developer
-  MACOSX_DEPLOYMENT_TARGET: '10.11'
+  # We are using macOS SDK 10.12 to work around a lot of OpenGL issues in newer SDKs.
+  # There are crashes on startup, crashes on window resize, etc. on newer macOS SDKs.
+  MACOSX_DEPLOYMENT_TARGET: '10.12'

  # WIN32 specific variables
  PreferredToolArchitecture: X64
@ -36,9 +38,9 @@ jobs:
          include:
            - os: windows-latest
              build_type: full
-            - os: macOS-latest
+            - os: macOS-10.15
              build_type: full
-            - os: macOS-latest
+            - os: macOS-10.15
              build_type: client
            - os: ubuntu-18.04
              build_type: full
@ -46,6 +48,10 @@ jobs:
            - os: ubuntu-18.04
              build_type: android
              apt-dependencies: mesa-common-dev libegl1 libglvnd-dev libdouble-conversion1 libpulse0
+            # Do not change the names of self-hosted runners without knowing what you are doing, as they correspond to labels that have to be set on the runner.
+            - os: self-hosted_debian-11_aarch64
+              build_type: full
+              apt-dependencies: qtbase5-dev qtbase5-private-dev qtwebengine5-dev qtwebengine5-dev-tools qtmultimedia5-dev libqt5opengl5-dev qtscript5-dev libqt5scripttools5 libqt5webchannel5-dev libqt5websockets5-dev qtxmlpatterns5-dev-tools qttools5-dev libqt5xmlpatterns5-dev libqt5svg5-dev qml-module-qtwebchannel build-essential cmake curl freeglut3-dev git libasound2 libasound2-dev libdouble-conversion-dev libdrm-dev libfontconfig1 libgl1-mesa-dev libglvnd-dev libharfbuzz-dev libjack-dev libjack0 libnspr4 libnss3 libpcre2-16-0 libpulse0 libsdl2-dev libssl-dev libudev-dev libxcb-xinerama0-dev libxcb-xinput0 libxcomposite1 libxcursor1 libxi-dev libxmu-dev libxrandr-dev libxslt1.1 libxtst6 make mesa-common-dev mesa-utils nodejs npm patchelf python2 python3 python3-distro xdg-user-dirs zlib1g-dev ninja-build zip
        fail-fast: false
    runs-on: ${{matrix.os}}
    if: github.event.action != 'labeled' || github.event.label.name == 'rebuild'
@ -59,24 +65,33 @@ jobs:
        echo "APP_TARGET_NAME=$APP_NAME" >> $GITHUB_ENV

        # Linux build variables
-        if [[ "${{ matrix.os }}" = "ubuntu-"* ]]; then
+        if [[ "${{ matrix.os }}" = "ubuntu-"* || "${{ matrix.os }}" = *"debian"* ]]; then
          echo "PYTHON_EXEC=python3" >> $GITHUB_ENV
          echo "INSTALLER_EXT=*" >> $GITHUB_ENV
-          echo "CMAKE_BUILD_EXTRA=-- -j3" >> $GITHUB_ENV
+          echo "CMAKE_BUILD_EXTRA=-- -j$(nproc)" >> $GITHUB_ENV
+          if [ "${{ matrix.os }}" = "self-hosted_debian-11_aarch64" ]; then
+            echo "VIRCADIA_USE_SYSTEM_QT=true" >> $GITHUB_ENV
+            echo "CI_WORKSPACE=${{runner.workspace}}" >> $GITHUB_ENV
+            # Don't optimize builds to save build time.
+            echo "VIRCADIA_OPTIMIZE=false" >> $GITHUB_ENV
+          fi
+          if [[ "${{ matrix.os }}" = *"aarch64" ]]; then
+            echo "VCPKG_FORCE_SYSTEM_BINARIES=true" >> $GITHUB_ENV
+          fi
          if [ "${{ matrix.build_type }}" = "full" ]; then
-            echo "CMAKE_EXTRA=-DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV
+            echo "CMAKE_EXTRA=-DVIRCADIA_CPU_ARCHITECTURE= -DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV
          else
-            echo "CMAKE_EXTRA=-DCLIENT_ONLY=1 -DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV
+            echo "CMAKE_EXTRA=-DVIRCADIA_CPU_ARCHITECTURE= -DCLIENT_ONLY=1 -DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV
          fi
        fi
        # Mac build variables
-        if [ "${{ matrix.os }}" = "macOS-latest" ]; then
+        if [ "${{ matrix.os }}" = "macOS-10.15" ]; then
          echo "PYTHON_EXEC=python3" >> $GITHUB_ENV
          echo "INSTALLER_EXT=dmg" >> $GITHUB_ENV
          if [ "${{ matrix.build_type }}" = "full" ]; then
-            echo "CMAKE_EXTRA=-DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=OFF -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -G Xcode" >> $GITHUB_ENV
+            echo "CMAKE_EXTRA=-DVIRCADIA_CPU_ARCHITECTURE= -DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=OFF -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOPENSSL_LIBRARIES=/usr/local/opt/openssl/lib -G Xcode" >> $GITHUB_ENV
          else
-            echo "CMAKE_EXTRA=-DCLIENT_ONLY=1 -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=OFF -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -G Xcode" >> $GITHUB_ENV
+            echo "CMAKE_EXTRA=-DVIRCADIA_CPU_ARCHITECTURE= -DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk -DCLIENT_ONLY=1 -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=OFF -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOPENSSL_LIBRARIES=/usr/local/opt/openssl/lib -G Xcode" >> $GITHUB_ENV
          fi
          echo "APP_TARGET_NAME=Vircadia" >> $GITHUB_ENV
        fi
@ -97,6 +112,7 @@ jobs:
          mkdir $HIFI_ANDROID_PRECOMPILED
          echo "INSTALLER_EXT=apk" >> $GITHUB_ENV
        fi
+
    # Configuration is broken into two steps because you can't set an env var and also reference it in the same step
    - name: Configure Build Environment 2
      shell: bash
@ -114,8 +130,9 @@ jobs:
        else
          echo "ARTIFACT_PATTERN=*.$INSTALLER_EXT" >> $GITHUB_ENV
        fi
+
    - name: Clear Working Directory
-      if: startsWith(matrix.os, 'windows')
+      if: startsWith(matrix.os, 'windows') || contains(matrix.os, 'self-hosted')
      shell: bash
      working-directory: ${{runner.workspace}}
      run: rm -rf ./*
@ -123,36 +140,66 @@ jobs:
      with:
        submodules: false
        fetch-depth: 1
+
    - name: Install dependencies
      shell: bash
-      if: startsWith(matrix.os, 'ubuntu')
+      if: startsWith(matrix.os, 'ubuntu') || contains(matrix.os, 'debian') || startsWith(matrix.os, 'macOS')
      run: |
-        echo "Installing Python Modules:"
-        pip3 install distro || exit 1
+        if [[ "${{ matrix.os }}" =~ "ubuntu" || "${{ matrix.os }}" =~ "debian" ]]; then
+          echo "Installing Python Modules:"
+          pip3 install distro || exit 1

-        echo "Updating apt repository index"
-        sudo apt update || exit 1
+          echo "Updating apt repository index"
+          sudo apt update || exit 1
+
+          echo "Installing apt packages"
+          sudo apt install -y ${{ matrix.apt-dependencies }} || exit 1
+        else # macOS
+          echo "Downloading MacOSX10.12 SDK.."
+          curl --progress-bar -L -o macOS_SDK10.12.4.tar.xz "https://cloudflare-ipfs.com/ipfs/QmTDLEYdo616YgZKSYC2mySSw8EKQWTz7CH8UyMupMBpzK?filename=macOS_SDK10.12.4.tar.xz" || exit 1
+          echo "  done\n"
+          echo "Checking MacOSX10.12 SDK.."
+          echo "c00e03cb64bed8d0d75d7a01c93de094b6ffaa3bc3318e7b29a9bdc354f0e29e363c454b7db89db8a3b78e9702668d1c661f1af279807de8db11accecb0ca498  macOS_SDK10.12.4.tar.xz" >> macOS_SDK10.12.4.tar.xz.checksum
+          shasum -a 512 -w -c macOS_SDK10.12.4.tar.xz.checksum
+          echo "Extracting MacOSX10.12 SDK.."
+          tar -xf macOS_SDK10.12.4.tar.xz || exit 1
+          echo "  done\n"
+          echo "Installing MacOSX10.12 SDK.."
+          # cp always sets an error code while copying the SDK so we return 0 when that happens.
+          sudo cp -rp MacOSX10.12.sdk /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/ || exit 0
+          echo "  done"
+        fi
+
+    - name: Override NSIS
+      shell: pwsh
+      if: startsWith(matrix.os, 'windows')
+      run: choco install nsis --version=3.06.1

-        echo "Installing apt packages"
-        sudo apt install -y ${{ matrix.apt-dependencies }} || exit 1
    - name: Create Build Environment
      shell: bash
      run: cmake -E make_directory "${{runner.workspace}}/build"
+
    - name: Configure CMake
      working-directory: ${{runner.workspace}}/build
      shell: bash
      run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DVCPKG_BUILD_TYPE=release $CMAKE_EXTRA
+
    - name: Compress cmake logs
      if: always()
      shell: bash
      run: |
-        if [ "${{ matrix.os }}" == "macOS-latest" ]; then
+        if [ "${{ matrix.os }}" == "macOS-10.15" ]; then
          TAR=gtar
        else
          TAR=tar
        fi

-        find "$HOME/vircadia-files/vcpkg" -name '*log' -type f -print0 | $TAR --null --force-local -T - -c --xz -v -f "${{ runner.workspace }}/cmake-logs-${{ matrix.os }}-${{ github.event.number }}.tar.xz"
+        if [ ${{ env.CI_WORKSPACE }} ]; then
+          find "$CI_WORKSPACE/vircadia-files/vcpkg" -name '*log' -type f -print0 | $TAR --null --force-local -T - -c --xz -v -f "${{ runner.workspace }}/cmake-logs-${{ matrix.os }}-${{ github.event.number }}.tar.xz"
+        else
+          find "$HOME/vircadia-files/vcpkg" -name '*log' -type f -print0 | $TAR --null --force-local -T - -c --xz -v -f "${{ runner.workspace }}/cmake-logs-${{ matrix.os }}-${{ github.event.number }}.tar.xz"
+        fi
+
    - name: Archive cmake logs
      if: always()
      uses: actions/upload-artifact@v2
@ -160,26 +207,31 @@ jobs:
        name: cmake-logs-${{ matrix.os }}-${{ github.event.number }}.tar.xz
        path: ${{ runner.workspace }}/cmake-logs-${{ matrix.os }}-${{ github.event.number }}.tar.xz
        if-no-files-found: error
+
    - name: Build Application
      if: matrix.build_type == 'full' || matrix.build_type == 'client'
      working-directory: ${{runner.workspace}}/build
      shell: bash
      run: cmake --build . --config $BUILD_TYPE --target $APP_TARGET_NAME $CMAKE_BUILD_EXTRA
+
    - name: Build Domain Server
      if: matrix.build_type == 'full'
      working-directory: ${{runner.workspace}}/build
      shell: bash
      run: cmake --build . --config $BUILD_TYPE --target domain-server $CMAKE_BUILD_EXTRA
+
    - name: Build Assignment Client
      if: matrix.build_type == 'full'
      working-directory: ${{runner.workspace}}/build
      shell: bash
      run: cmake --build . --config $BUILD_TYPE --target assignment-client $CMAKE_BUILD_EXTRA
+
    - name: Build Console
      if: matrix.build_type == 'full' || matrix.os == 'windows-latest'
      working-directory: ${{runner.workspace}}/build
      shell: bash
      run: cmake --build . --config $BUILD_TYPE --target packaged-server-console $CMAKE_BUILD_EXTRA
+
    - name: Build Installer
      if: matrix.build_type != 'android'
      working-directory: ${{runner.workspace}}/build
@ -218,6 +270,7 @@ jobs:
      working-directory: ${{runner.workspace}}/vircadia
      run: |
        /usr/local/lib/android/sdk/tools/bin/sdkmanager --uninstall 'cmake;3.18.1'
+
    - name: Build for Android + Quest
      if: matrix.build_type == 'android'
      shell: bash
@ -230,6 +283,7 @@ jobs:
        ./gradlew -m tasks -PHIFI_ANDROID_PRECOMPILED=$HIFI_ANDROID_PRECOMPILED
        # Build!
        ./build_android.sh
+
    - name: Output system stats
      if: ${{ always() }}
      working-directory: ${{runner.workspace}}/build
@ -237,11 +291,13 @@ jobs:
      run: |
        echo "Disk usage:"
        df -h
+
    - name: Output Installer Logs
      if: failure() && matrix.os == 'windows-latest'
      shell: bash
      working-directory: ${{runner.workspace}}/build
      run: cat ./_CPack_Packages/win64/NSIS/NSISOutput.log
+
    - name: Upload Artifact
      shell: bash
      working-directory: ${{runner.workspace}}/build
--- a/.gitmodules
+++ b/.gitmodules
@ -1,3 +0,0 @@
-[submodule "vircadia-web"]
-	path = vircadia-web
-	url = ../vircadia-web.git
--- a/.grenrc.js
+++ b/.grenrc.js
@ -19,6 +19,8 @@ module.exports = {
    "ignoreLabels": [
        "enhancement",
        "bugfix",
+        "CMake",
+        "unmerged-dev",
        "CR Approved",
        "QA Approved",
        "allow-build-upload",
@ -33,11 +35,12 @@ module.exports = {
        "rebuild",
        "merge right before snip"
    ],
-    "onlyMilestones": true,
+    "onlyMilestones": false,
    "groupBy": {
        "Enhancements": ["enhancement"],
        "Bug Fixes": ["bugfix"],
-        "Docs": ["docs"]
+        "Docs": ["docs"],
+        "In Development": ["unmerged-dev"]
    },
    "changelogFilename": "CHANGELOG.md"
 }
--- a/BUILD.md
+++ b/BUILD.md
@ -192,6 +192,13 @@ The following build options can be used when running CMake
 * CLIENT_ONLY // Will package only the Interface
 * SERVER_ONLY // Will package only the Server

+### Optimization build options
+
+* VIRCADIA_OPTIMIZE - This variable defaults to 1 if not set and enables compiler optimization flags on Linux and MacOS. Setting it to 0 will result in unoptimized build.
+* VIRCADIA_CPU_ARCHITECTURE - This variable contains architecture specific compiler flags which are used if `VIRCADIA_OPTIMIZE` is true. If it is not set, it defaults to `-march=native -mtune=native`, which helps yield more performance for locally used build, but for packaging it needs to be set to different value for portability, for example `-msse3`. Setting `VIRCADIA_CPU_ARCHITECTURE` to empty string will use default compiler settings and yield
+maximum compatibility.
+
+
 ### Developer Build Options

 * USE_GLES
--- a/BUILD_LINUX.md
+++ b/BUILD_LINUX.md
@ -1,75 +1,81 @@
 # Build Linux

-*Last Updated on December 1, 2020*
+*Last Updated on January 6, 2022*

 Please read the [general build guide](BUILD.md) for information on dependencies required for all platforms. Only Linux specific instructions are found in this file.

 You can use the [Vircadia Builder](https://github.com/vircadia/vircadia-builder) to build on Linux more easily. Alternatively, you can follow the manual steps below.

-## Ubuntu 16.04/18.04 specific build guide
-### Ubuntu 16.04 only
-Add the following line to *.bash_profile*  
-`export QT_QPA_FONTDIR=/usr/share/fonts/truetype/dejavu/`
-### Ubuntu 18.04 server only
+## Ubuntu 18.04
+
+### Ubuntu 18.04 Server only
 Add the universe repository:  
-_(This is not enabled by default on the server edition)_
+_(This is not enabled by default on the server edition.)_
 ```bash
 sudo add-apt-repository universe
 sudo apt-get update
 ```
-#### Install build tools:
+
+### Install build tools:
 -  First update the repositories:  
 ```bash
 sudo apt-get update -y
 sudo apt-get upgrade -y
 ```
-  git
+
+-  Install git
 ```bash
 sudo apt-get install git -y
 ```
-Verify by git --version  
-  g++
+Verify git was installed by running `git --version`.
+
+-  Install g++
 ```bash
 sudo apt-get install g++ -y
 ```
-Verify by g++ --version  
-  *Ubuntu 18.04* cmake
+Verify g++ was installed by running `g++ --version`.
+
+-  **Ubuntu 18.04** CMake
 ```bash
 sudo apt-get install cmake -y
 ```
-Verify by cmake --version  
- *Ubuntu 16.04* cmake  
-```bash
-wget https://cmake.org/files/v3.14/cmake-3.14.2-Linux-x86_64.sh
-sudo sh cmake-3.14.2-Linux-x86_64.sh --prefix=/usr/local --exclude-subdir
-```
-#### Install build dependencies:
+Verify CMake was installed by running `cmake --version`.
+
+### Install build dependencies:
 -  OpenSSL:
 ```bash
 sudo apt-get install libssl-dev
 ```
-Verify with `openssl version`  
+Verify OpenSSL was installed by running `openssl version`.
+
 - OpenGL:
 ```bash
 sudo apt-get install libgl1-mesa-dev -y
-sudo ln -s /usr/lib/x86_64-linux-gnu/libGL.so.346.35 /usr/lib/x86_64-linux-gnu/libGL.so.1.2.0
 ```
- Verify OpenGL:
-  - First install mesa-utils with the command `sudo apt install mesa-utils -y`
-  - Then run `glxinfo | grep "OpenGL version"`  
-#### To compile interface in a server you must install:
+Verify OpenGL:
+  - First install mesa-utils with the command `sudo apt install mesa-utils -y`.
+  - Then run `glxinfo | grep "OpenGL version"`.
+
+
+### Extra dependencies to compile Interface on a server
+
+
+- Install the following:
 ```bash
 sudo apt-get -y install libpulse0 libnss3 libnspr4 libfontconfig1 libxcursor1 libxcomposite1 libxtst6 libxslt1.1
 ```
+
 -  Misc dependencies:
 ```bash
 sudo apt-get install libasound2 libxmu-dev libxi-dev freeglut3-dev libasound2-dev libjack0 libjack-dev libxrandr-dev libudev-dev libssl-dev zlib1g-dev
 ```
+
 -  Install Python 3 and required packages:
 ```bash
 sudo apt-get install python python3 python3-distro
 ```
-  Install node, required to build the jsdoc documentation:
+
+-  Install Node.js as it is required to build the jsdoc documentation:
 ```bash
 sudo apt-get install nodejs
 ```
@ -81,16 +87,17 @@ Clone this repository:
 git clone https://github.com/vircadia/vircadia.git
 ```

-To compile a DEV version checkout the branch you need. To get a list of all tags:
-```bash
-git fetch -a
-```
-
-Then checkout the main branch with:
+Then checkout the master branch with:
 ```bash
 git checkout master
 ```

+If you need a different branch, you can get a list of all tags with:
+```bash
+git fetch --tags
+git tag
+```
+
 ### Using a custom Qt build

 Qt binaries are only provided for Ubuntu. In order to build on other distributions, a Qt5 install
@ -104,6 +111,18 @@ The system's Qt can be used, if the development packages are installed, by setti
 also the last version available in the Qt 5 branch. It is expected that Linux distributions will have
 Qt 5.15.2 available for a long time.

+### Architecture support
+
+If the build is intended to be packaged for distribution, the `VIRCADIA_CPU_ARCHITECTURE`
+CMake variable needs to be set to an architecture specific value.
+
+By default, it is set to `-march=native -mtune=native`, which yields builds optimized for a particular
+machine, but these builds will not work on machines lacking same CPU instructions.
+
+For packaging, it is recommended to set it to a different value, for example `-msse3`. This will help ensure that the build will run on all reasonably modern CPUs.
+
+Setting `VIRCADIA_CPU_ARCHITECTURE` to an empty string will use the default compiler settings and yield maximum compatibility.
+
 ### Compiling

 Create the build directory:
@ -118,33 +137,34 @@ Prepare makefiles:
 cmake ..
 ```

- If cmake fails with a vcpkg error - delete /tmp/hifi/vcpkg.  
+If cmake fails with a vcpkg error, then delete `~/vircadia-files/vcpkg/`.  

-Start compilation of the server and get a cup of coffee:
+#### Server
+
+To compile the Domain server:
 ```bash
 make domain-server assignment-client
 ```

-To compile interface:
+*Note: For a server, it is not necessary to compile the Interface.*
+
+#### Interface
+
+To compile the Interface client:
 ```bash
 make interface
 ```

-The commands above will compile with a single thread. If you have enough memory,
-you can decrease your build time using the `-j` flag. Since most x64 CPUs
-support two threads per core, this works out to CPU_COUNT*2. As an example, if
-you have a 2 core machine, you could use:
-```
+The commands above will compile with a single thread. If you have enough memory, you can decrease your build time using the `-j` flag. Since most x64 CPUs support two threads per core, this works out to CPU_COUNT*2. As an example, if you have a 2 core machine, you could use:
+```bash
 make -j4 interface
 ```

-In a server, it does not make sense to compile interface.
-
 ### Running the software

 #### Domain server

-Running domain server:
+Running Domain server:
 ```bash
 ./domain-server/domain-server
 ```
@ -158,16 +178,16 @@ Running assignment client:

 #### Interface

-Running interface:
+Running Interface:
 ```bash
 ./interface/interface
 ```

-Go to localhost in the running interface.
+Go to "localhost" in the running Interface to visit your newly launched Domain server.

-#### Notes
+### Notes

-If your goal is to set up a development environment, it is desirable to set the
-directory that vcpkg builds into with the `HIFI_VCPKG_BASE` environment variable.
+If your goal is to set up a development environment, it is desirable to set the directory that vcpkg builds into with the `HIFI_VCPKG_BASE` environment variable.
 For example, you might set `HIFI_VCPKG_BASE` to `/home/$USER/vcpkg`.
-By default, vcpkg will build in the system `/tmp` directory.
+
+By default, vcpkg will build in the `~/vircadia-files/vcpkg/` directory.
--- a/BUILD_OSX.md
+++ b/BUILD_OSX.md
@ -1,63 +1,87 @@
-# Build OSX
+# Build macOS

-*Last Updated on January 16, 2021*
+*Last Updated on December 1, 2021*

-Please read the [general build guide](BUILD.md) for information on dependencies required for all platforms. Only macOS specific instructions are found in this document.
+Please read the [general build guide](BUILD.md) for information on dependencies required for all platforms. This will include the necessary environment variables to customize your build. Only macOS specific instructions are found in this document.

-## Homebrew
+## Prerequisites

-[Homebrew](https://brew.sh/) is an excellent package manager for macOS. It makes install of some Vircadia dependencies very simple.
+### CMake, OpenSSL, and NPM
+
+[Homebrew](https://brew.sh/) is an excellent package manager for macOS. It makes the installation of some Vircadia dependencies very simple.

 ```bash
 brew install cmake openssl npm
 ```

-Note: cmake versions > 3.18.x have known problems building Vircadia, so alternatively you can download cmake 3.18.4 (or earlier versions) from [Github](https://github.com/Kitware/CMake/releases).
+**Note:** You can also download alternative CMake versions from [Github](https://github.com/Kitware/CMake/releases) if needed.

-## Python 3
+### Python 3

 Download an install Python 3.6.6 or higher from [here](https://www.python.org/downloads/).
 Execute the `Update Shell Profile.command` script that is provided with the installer.

-## OSX SDK
+### macOS SDK

-You will need version `10.12` of the OSX SDK for building, otherwise you may have crashing or other unintended issues due to the deprecation of OpenGL on OSX. You can get that SDK from [here](https://github.com/phracker/MacOSX-SDKs). You must copy it in to your Xcode SDK directory, e.g.
+You will need version `10.12` of the macOS SDK for building, otherwise you may experience crashing or other unintended issues due to the deprecation of OpenGL on macOS. You can get that SDK from [here](https://github.com/phracker/MacOSX-SDKs). You must copy it in to your Xcode SDK directory, e.g.

 ```bash
 cp -rp ~/Downloads/MacOSX10.12.sdk /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/
 ```

-## OpenSSL
+### OpenSSL

-Assuming you've installed OpenSSL using the homebrew instructions above, you'll need to set OPENSSL_ROOT_DIR so CMake can find your installations.
-For OpenSSL installed via homebrew, set OPENSSL_ROOT_DIR via
-    `export OPENSSL_ROOT_DIR=/usr/local/opt/openssl`
-    or by appending `-DOPENSSL_ROOT_DIR=/usr/local/opt/openssl` to `cmake`
+Assuming you've installed OpenSSL using the homebrew instructions above, you'll need to set `OPENSSL_ROOT_DIR` so CMake can find your installations.
+For OpenSSL installed via homebrew, set `OPENSSL_ROOT_DIR` via `export OPENSSL_ROOT_DIR=/usr/local/opt/openssl` or by appending `-DOPENSSL_ROOT_DIR=/usr/local/opt/openssl` to `cmake`.

-## Xcode
+## Generate and Build
+
+You can choose to use either Unix Makefiles or Xcode.
+
+### Xcode

 You can ask CMake to generate Xcode project files instead of Unix Makefiles using the `-G Xcode` parameter after CMake. You will need to select the Xcode installation in the terminal first if you have not done so already.

 ```bash
 sudo xcode-select --switch /Applications/Xcode.app/Contents/Developer

-cmake ../ -DCMAKE_OSX_SYSROOT="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOSX_SDK=10.12  ..
+cmake ../ -DCMAKE_OSX_SYSROOT="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -G Xcode -DOSX_SDK=10.12  ..
 ```

-If `cmake` complains about Python 3 being missing, you may need to update your CMake binary with command `brew upgrade cmake`, or by downloading and running the latest CMake installer, depending on how you originally installed CMake.
-
-After running CMake, you will have the make files or Xcode project file necessary to build all of the components. Open the hifi.xcodeproj file, choose ALL_BUILD from the Product > Scheme menu (or target drop down), and click Run.
+After running CMake, you will have the make files or Xcode project file necessary to build all of the components. Open the `vircadia.xcodeproj` file, choose `ALL_BUILD` from the Product > Scheme menu (or target drop down), and click Run.

 If the build completes successfully, you will have built targets for all components located in the `build/${target_name}/Debug` directories.

-## make
+### make

-If you build with make rather than Xcode, you can append `-j4` for assigning more threads. The number indicates the number of threads, e.g. 4.
+Run CMake.
+
+```bash
+cmake -DCMAKE_OSX_SYSROOT="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOSX_SDK=10.12  ..
+```
+
+You can append `-j4` to assign more threads to build with. The number indicates the number of threads, e.g. 4.

 To package the installation, you can simply run `make package` afterwards.

+## Architecture Support
+
+If the build is intended to be packaged for distribution, the `VIRCADIA_CPU_ARCHITECTURE`
+CMake variable needs to be set to an architecture specific value.
+
+By default, it is set to `-march=native -mtune=native`, which yields builds optimized for a particular
+machine, but these builds will not work on machines lacking same CPU instructions.
+
+For packaging, it is recommended to set it to a different value, for example `-msse3`. This will help ensure that the build will run on all reasonably modern CPUs.
+
+Setting `VIRCADIA_CPU_ARCHITECTURE` to an empty string will use the default compiler settings and yield
+maximum compatibility.
+
 ## FAQ

-1. **Problem:** Running the scheme `interface.app` from Xcode causes a crash for Interface related to `libgl`
+1. **Problem:** Running the scheme `interface.app` from Xcode causes a crash for Interface related to `libgl`.
    1. **Cause:** The target `gl` generates a binary called `libgl`. A macOS `libGL.framework` item gets loaded instead by Xcode.
-    1. **Solution:** In the Xcode target settings for `libgl`, set the version to 1.0.0
+    2. **Solution:** In the Xcode target settings for `libgl`, set the version to `1.0.0`.
+2. **Problem:** CMake complains about Python 3 being missing.
+    1. **Cause:** CMake might be out of date.
+    2. **Solution:** Try updating your CMake binary with command `brew upgrade cmake`, or by downloading and running a newer CMake installer, depending on how you originally installed CMake. Please keep in mind the recommended CMake versions noted above.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -74,6 +74,67 @@ if ((NOT "${RELEASE_TYPE}" STREQUAL "PRODUCTION") AND (NOT "${RELEASE_TYPE}" STR
    set(RELEASE_TYPE "DEV")
 endif()

+# VIRCADIA_OPTIMIZE
+# Variable determining vircadia optimization. If not set, it defaults to true.
+# It's used to determine build flags for main codebase and for VCPKG dependencies.
+# Should be set to false to get completely unoptimized build for easier line-by-line debugging
+
+if( NOT WIN32 )
+    if(NOT DEFINED VIRCADIA_OPTIMIZE)
+        message("Enabling code optimization for Vircadia and compiled dependencies")
+        set(VIRCADIA_OPTIMIZE true CACHE BOOL "Enable code optimization for Vircadia and compiled dependencies")
+    endif()
+
+    #compiler needs to be detected before building VCPKG dependencies
+    set(CMAKE_PLATFORM_INFO_DIR "${CMAKE_CURRENT_BINARY_DIR}")
+    include(CMakeDetermineCXXCompiler)
+
+    set(VIRCADIA_OPTIMIZE_FLAGS "")
+
+    if(VIRCADIA_OPTIMIZE)
+
+        file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/_env/VIRCADIA_OPTIMIZE.txt" "${VIRCADIA_OPTIMIZE}")
+        if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+            message("Clang compiler detected, adding -O3 -fPIC -g flags")
+            set(VIRCADIA_OPTIMIZE_FLAGS "-O3 -fPIC -g")
+        elseif (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+            message("GCC compiler detected, adding -O3 -fPIC -ggdb flags")
+            set(VIRCADIA_OPTIMIZE_FLAGS "-O3 -fPIC -ggdb")
+        else()
+            message("No predefined optimization flags for compiler ${CMAKE_CXX_COMPILER_ID}")
+        endif()
+    endif()
+    MESSAGE(STATUS "VIRCADIA_OPTIMIZE: ${VIRCADIA_OPTIMIZE}")
+
+    # VIRCADIA_CPU_ARCHITECTURE
+    # Variable determining CPU architecture for which Vircadia will be built.
+    # If defined, it's appended to CXXFLAGS and CFLAGS for both Vircadia and VCPKG dependencies
+
+    #Assume -march=native for compilers that allow it if architecture is not specified
+    if(NOT DEFINED VIRCADIA_CPU_ARCHITECTURE)
+        if(VIRCADIA_OPTIMIZE AND ( (CMAKE_CXX_COMPILER_ID MATCHES "Clang") OR (CMAKE_CXX_COMPILER_ID MATCHES "GNU") ) )
+            message("Optimization is enabled, but architecture is not specified. Assuming native build")
+            set(VIRCADIA_CPU_ARCHITECTURE "-march=native -mtune=native" CACHE STRING "Specify architecture dependent compiler flags here")
+        endif()
+    endif()
+
+    if(DEFINED VIRCADIA_CPU_ARCHITECTURE)
+        file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/_env/VIRCADIA_CPU_ARCHITECTURE.txt" "${VIRCADIA_CPU_ARCHITECTURE}")
+        set(VIRCADIA_OPTIMIZE_FLAGS "${VIRCADIA_OPTIMIZE_FLAGS} ${VIRCADIA_CPU_ARCHITECTURE}")
+        message("Adding CPU architecture flags: ${VIRCADIA_CPU_ARCHITECTURE}")
+        MESSAGE(STATUS "VIRCADIA_CPU_ARCHITECTURE: ${VIRCADIA_CPU_ARCHITECTURE}")
+    endif()
+
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${VIRCADIA_OPTIMIZE_FLAGS}")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${VIRCADIA_OPTIMIZE_FLAGS}")
+
+    set(ENV{CXXFLAGS} "$ENV{CXXFLAGS} ${VIRCADIA_OPTIMIZE_FLAGS}")
+    set(ENV{CFLAGS} "$ENV{CFLAGS} ${VIRCADIA_OPTIMIZE_FLAGS}")
+    message($ENV{CXXFLAGS})
+endif()
+
+
+
 if (HIFI_ANDROID)
    execute_process(
        COMMAND ${HIFI_PYTHON_EXEC} ${CMAKE_CURRENT_SOURCE_DIR}/prebuild.py --release-type ${RELEASE_TYPE} --android ${HIFI_ANDROID_APP} --build-root ${CMAKE_BINARY_DIR}
@ -288,11 +349,23 @@ GroupSources("scripts")
 GroupSources("unpublishedScripts")
 unset(JS_SRC)

-file(GLOB_RECURSE WEB_APP_SRC vircadia-web/*.*)
-list(FILTER WEB_APP_SRC EXCLUDE REGEX "vircadia-web/(dist|node_modules|public)/*" )
-add_custom_target(vircadia-web SOURCES ${WEB_APP_SRC})
-GroupSources("vircadia-web")
-unset(WEB_APP_SRC)
+# Include Vircadia Web app files if cloned into a subdirectory.
+if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/vircadia-web")
+    file(GLOB_RECURSE WEB_APP_SRC vircadia-web/*.*)
+    list(FILTER WEB_APP_SRC EXCLUDE REGEX "vircadia-web/(dist|node_modules|public)/*" )
+    add_custom_target(vircadia-web SOURCES ${WEB_APP_SRC})
+    GroupSources("vircadia-web")
+    unset(WEB_APP_SRC)
+endif()
+
+# Include Vircadia Web SDK files if cloned into a subdirectory.
+if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/vircadia-web-sdk")
+    file(GLOB_RECURSE WEB_SDK_SRC vircadia-web-sdk/*.*)
+    list(FILTER WEB_SDK_SRC EXCLUDE REGEX "vircadia-web-sdk/(dist|node_modules|public)/*" )
+    add_custom_target(vircadia-web-sdk SOURCES ${WEB_SDK_SRC})
+    GroupSources("vircadia-web-sdk")
+    unset(WEB_SDK_SRC)
+endif()

 set_packaging_parameters()

--- a/CODING_STANDARD.md
+++ b/CODING_STANDARD.md
@ -948,7 +948,7 @@ In an international environment English is the preferred language.

 #### [4.3.2] Use // for all comments, including multi-line comments.

-An exception to this rule applies for jsdoc or Doxygen comments.
+An exception to this rule applies to JSDoc and Doxygen comments.

 ```cpp
 // Comment spanning
@ -1008,3 +1008,11 @@ These types of comments are explicitly not allowed. If you need to break up sect
 //--------------------------------------------------------------------------------
 ```

+#### [4.3.6] Doxygen comments should use "///"
+
+Use the `///` style of [Doxygen](https://www.doxygen.nl/index.html) comments when documenting public interfaces.
+
+Some editors can automatically create a Doxygen documentation stub if you type `///` in the line above the item to be
+documented.
+
+**Visual Studio:** To configure Visual Studio's Doxygen commenting behavior, search for "Doxygen" in Tools > Options.
--- a/INSTALLER.md
+++ b/INSTALLER.md
@ -187,13 +187,13 @@ For code signing to work, you will need to set the `HF_PFX_FILE` and `HF_PFX_PAS
    ```bash
    cd ../Vircadia/source/pkg-scripts/
    ```
-17. Generate the .rpm package. Set `RPMVERSION` to the same version you entered for the `Release number` on Vircadia Builder. *Advanced users: the version cannot begin with a letter and cannot include underscores or dashes in it.*
+17. Generate the .deb package. Set `DEBVERSION` to the same version you entered for the `Release number` on Vircadia Builder. Set `DEBEMAIL` and `DEBFULLNAME` to your own information to be packaged with the release. *The version cannot begin with a letter and cannot include underscores or dashes in it.*
    ```bash
    DEBVERSION="2021.1.0" DEBEMAIL="your-email@somewhere.com" DEBFULLNAME="Your Full Name" ./make-deb-server
    ```
 18. If successful, the generated .deb package will be in the `pkg-scripts` folder.

-##### Amazon Linux 2 | .rpm
+##### Amazon Linux 2 | .rpm (Deprecated)

 1. Ensure you are using an Amazon Linux 2 system. You will need many CPU cores to complete this process within a reasonable time. As an alternative to AWS EC2, you may use a [virtual machine](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/amazon-linux-2-virtual-machine.html). Here are the recommended specs:
    ```text
@ -266,7 +266,7 @@ For code signing to work, you will need to set the `HF_PFX_FILE` and `HF_PFX_PAS
    ```bash
    cd ../Vircadia/source/pkg-scripts/
    ```
-18. Generate the .rpm package. Set `RPMVERSION` to the same version you entered for the `Release number` on Vircadia Builder. *Advanced users: the version cannot begin with a letter and cannot include underscores or dashes in it.*
+18. Generate the .rpm package. Set `RPMVERSION` to the same version you entered for the `Release number` on Vircadia Builder. *The version cannot begin with a letter and cannot include underscores or dashes in it.*
    ```bash
    RPMVERSION="2021.1.0" ./make-rpm-server
    ```
--- a/README.md
+++ b/README.md
@ -1,8 +1,17 @@
 <p align="center"><a href="https://vircadia.com/"><img src="interface/resources/images/vircadia-banner.svg" alt="Vircadia - Codename Athena" width="350"/></a></p>
 <h3 align="center"><a href="https://vircadia.com/">Website</a> | <a href="https://discordapp.com/invite/Pvx2vke">Discord</a> | <a href="https://vircadia.com/download-vircadia/">Download</a></h3>
-<p align="center"><a href="CONTRIBUTING.md"><img alt="GitHub contributors" src="https://img.shields.io/github/contributors/vircadia/vircadia"></a> <a href="https://github.com/vircadia/vircadia/stargazers"><img alt="GitHub stars" src="https://img.shields.io/github/stars/vircadia/vircadia"></a> <a href="https://github.com/vircadia/vircadia/network"><img alt="GitHub forks" src="https://img.shields.io/github/forks/vircadia/vircadia"></a> <a href="https://www.apache.org/licenses/LICENSE-2.0"><img alt="Apache 2.0" src="https://img.shields.io/badge/license-Apache--2.0-%230A7BBB?style=flat"></a> <a href="https://discordapp.com/invite/Pvx2vke"><img alt="Discord" src="https://img.shields.io/discord/564926326025224212?style=flat"></a></p>
+<p align="center">
+    <a href="https://vircadia.com/contribute"><img alt="GitHub contributors" src="https://img.shields.io/github/contributors/vircadia/vircadia"></a>
+    <a href="https://github.com/sponsors/digisomni"><img alt="GitHub sponsors" src="https://img.shields.io/github/sponsors/digisomni?style=flat&label=github%20sponsors"></a>
+    <a href="https://github.com/vircadia/vircadia/stargazers"><img alt="GitHub stars" src="https://img.shields.io/github/stars/vircadia/vircadia"></a>
+    <a href="https://github.com/vircadia/vircadia/network"><img alt="GitHub forks" src="https://img.shields.io/github/forks/vircadia/vircadia"></a>
+    <a href="https://www.apache.org/licenses/LICENSE-2.0"><img alt="Apache 2.0" src="https://img.shields.io/badge/license-Apache--2.0-%230A7BBB?style=flat"></a>
+    <a href="https://discordapp.com/invite/Pvx2vke"><img alt="Discord" src="https://img.shields.io/discord/564926326025224212?style=flat"></a>
+</p>
 <h3 align="center">Build Status</h3>
-<p align="center"><a href="https://github.com/vircadia/vircadia/actions/workflows/master_build.yml"><img alt="Master CI Build" src="https://github.com/vircadia/vircadia/actions/workflows/master_build.yml/badge.svg"></a></p>
+<p align="center">
+    <a href="https://github.com/vircadia/vircadia/actions/workflows/master_build.yml"><img alt="Master CI Build" src="https://github.com/vircadia/vircadia/actions/workflows/master_build.yml/badge.svg"></a>
+</p>

 ### What is this?

@ -45,12 +54,11 @@ Vircadia™ is a 3D social software project seeking to incrementally bring about
 - [For Windows - Interface & Server](https://github.com/vircadia/vircadia/blob/master/INSTALLER.md)
 - [For Mac - Interface](https://github.com/vircadia/vircadia/blob/master/INSTALLER.md#os-x)
 - [For Linux - Server .deb - Vircadia Builder](INSTALLER.md#ubuntu-1804--deb)
- [For Linux - Server .rpm - Vircadia Builder](INSTALLER.md#amazon-linux-2--rpm)
 - [For Linux - Interface AppImage - Vircadia Builder](https://github.com/vircadia/vircadia-builder/blob/master/README.md#building-appimages)

 ### Boot to Metaverse: [The Goal](https://vircadia.com/vision/)

-Having a place to experience adventure, a place to relax with calm breath, that's a world to live in. An engine to support infinite combinations and possibilities of worlds without censorship and interruption, that's a metaverse. Finding a way to make infinite realities our reality is the dream.
+Having a place to experience adventure, a place to relax with calm breath, that's a world to live in. An engine to support infinite combinations and possibilities of worlds without censorship and interruption, that's metaverse. Finding a way to make infinite realities our reality is the dream.

 ### Boot to Metaverse: The Technicals

@ -64,17 +72,29 @@ Vircadia consists of many projects and codebases with its unifying structure's g
 - [The Metaverse Server Dashboard (Codename Iamus)](https://github.com/vircadia/project-iamus-dashboard/)
 - [The Launcher (Codename Pantheon)](https://github.com/vircadia/pantheon-launcher/) - Currently Windows only.

-#### Child Projects
+#### Tools
 - [Vircadia Builder for Linux](https://github.com/vircadia/vircadia-builder/)
+
+#### Documentation
 - [User Documentation](https://github.com/vircadia/vircadia-docs-sphinx/)
 - [Developer Documentation](https://github.com/vircadia/vircadia-dev-docs/)

 ### Contribution

-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)!
+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](https://vircadia.com/contribute)!

-### [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
+
+One (1) anonymous, three (3) total sponsors through GitHub. ❤️
+
+| [Daichi Shimabukuro](https://github.com/mshlomd) |
 | --- |
-| <p align="center">[![ksuprynowicz](https://avatars.githubusercontent.com/u/11568651?s=64&v=4)](https://github.com/ksuprynowicz)</p>
+| <p align="center">[<img src="https://avatars.githubusercontent.com/u/4787162?v=4" width="80" alt="Daichi Shimabukuro" />](https://github.com/mshlomd)</p>
--- a/assignment-client/src/Agent.cpp
+++ b/assignment-client/src/Agent.cpp
@ -288,10 +288,10 @@ void Agent::nodeKilled(SharedNodePointer killedNode) {
 void Agent::negotiateAudioFormat() {
    auto nodeList = DependencyManager::get<NodeList>();
    auto negotiateFormatPacket = NLPacket::create(PacketType::NegotiateAudioFormat);
-    auto codecPlugins = PluginManager::getInstance()->getCodecPlugins();
+    const auto& codecPlugins = PluginManager::getInstance()->getCodecPlugins();
    quint8 numberOfCodecs = (quint8)codecPlugins.size();
    negotiateFormatPacket->writePrimitive(numberOfCodecs);
-    for (auto& plugin : codecPlugins) {
+    for (const auto& plugin : codecPlugins) {
        auto codecName = plugin->getName();
        negotiateFormatPacket->writeString(codecName);
    }
@ -326,8 +326,8 @@ void Agent::selectAudioFormat(const QString& selectedCodecName) {
    }
    _receivedAudioStream.cleanupCodec();

-    auto codecPlugins = PluginManager::getInstance()->getCodecPlugins();
-    for (auto& plugin : codecPlugins) {
+    const auto& codecPlugins = PluginManager::getInstance()->getCodecPlugins();
+    for (const auto& plugin : codecPlugins) {
        if (_selectedCodecName == plugin->getName()) {
            _codec = plugin;
            _receivedAudioStream.setupCodec(plugin, _selectedCodecName, AudioConstants::STEREO);
--- a/assignment-client/src/Agent.h
+++ b/assignment-client/src/Agent.h
@ -17,6 +17,7 @@

 #include <QtScript/QScriptEngine>
 #include <QtCore/QObject>
+#include <QtCore/QSharedPointer>
 #include <QtCore/QUrl>
 #include <QtCore/QTimer>
 #include <QUuid>
--- a/assignment-client/src/AssignmentClient.cpp
+++ b/assignment-client/src/AssignmentClient.cpp
@ -14,6 +14,7 @@

 #include <assert.h>

+#include <QJsonDocument>
 #include <QProcess>
 #include <QSharedMemory>
 #include <QThread>
@ -45,7 +46,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();
@ -83,13 +85,20 @@ AssignmentClient::AssignmentClient(Assignment::Type requestAssignmentType, QStri
        _assignmentServerHostname = assignmentServerHostname;
    }

-    _assignmentServerSocket = SockAddr(_assignmentServerHostname, assignmentServerPort, true);
+    _assignmentServerSocket = SockAddr(SocketType::UDP, _assignmentServerHostname, assignmentServerPort, true);
    if (_assignmentServerSocket.isNull()) {
        qCCritical(assignment_client) << "PAGE: Couldn't resolve domain server address" << _assignmentServerHostname;
    }
    _assignmentServerSocket.setObjectName("AssignmentServer");
    nodeList->setAssignmentServerSocket(_assignmentServerSocket);

+    if (disableDomainPortAutoDiscovery) {
+        _disableDomainPortAutoDiscovery = disableDomainPortAutoDiscovery;
+        qCDebug(assignment_client) << "Disabling domain port auto discovery by the assignment client due to parsed command line parameter.";
+    }
+
+    nodeList->disableDomainPortAutoDiscovery(_disableDomainPortAutoDiscovery);
+
    qCDebug(assignment_client) << "Assignment server socket is" << _assignmentServerSocket;

    // call a timer function every ASSIGNMENT_REQUEST_INTERVAL_MSECS to ask for assignment, if required
@ -111,7 +120,8 @@ AssignmentClient::AssignmentClient(Assignment::Type requestAssignmentType, QStri

    // did we get an assignment-client monitor port?
    if (assignmentMonitorPort > 0) {
-        _assignmentClientMonitorSocket = SockAddr(DEFAULT_ASSIGNMENT_CLIENT_MONITOR_HOSTNAME, assignmentMonitorPort);
+        _assignmentClientMonitorSocket = SockAddr(SocketType::UDP, DEFAULT_ASSIGNMENT_CLIENT_MONITOR_HOSTNAME, 
+            assignmentMonitorPort);
        _assignmentClientMonitorSocket.setObjectName("AssignmentClientMonitor");

        qCDebug(assignment_client) << "Assignment-client monitor socket is" << _assignmentClientMonitorSocket;
@ -124,6 +134,18 @@ AssignmentClient::AssignmentClient(Assignment::Type requestAssignmentType, QStri
        PacketReceiver::makeUnsourcedListenerReference<AssignmentClient>(this, &AssignmentClient::handleCreateAssignmentPacket));
    packetReceiver.registerListener(PacketType::StopNode,
        PacketReceiver::makeUnsourcedListenerReference<AssignmentClient>(this, &AssignmentClient::handleStopNodePacket));
+
+#if defined(WEBRTC_DATA_CHANNELS)
+    auto webrtcSocket = nodeList->getWebRTCSocket();
+
+    // Route inbound WebRTC signaling messages from the Domain Server.
+    packetReceiver.registerListener(PacketType::WebRTCSignaling,
+        PacketReceiver::makeUnsourcedListenerReference<AssignmentClient>(this, &AssignmentClient::handleWebRTCSignalingPacket));
+    connect(this, &AssignmentClient::webrtcSignalingMessageFromUserClient, webrtcSocket, &WebRTCSocket::onSignalingMessage);
+
+    // Route outbound WebRTC signaling messages via the Domain Server to the user client.
+    connect(webrtcSocket, &WebRTCSocket::sendSignalingMessage, this, &AssignmentClient::sendSignalingMessageToUserClient);
+#endif
 }

 void AssignmentClient::stopAssignmentClient() {
@ -165,7 +187,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) {
@ -176,7 +198,7 @@ void AssignmentClient::sendStatusPacketToACM() {

    statusPacket->write(_childAssignmentUUID.toRfc4122());
    statusPacket->writePrimitive(assignmentType);
-    
+
    nodeList->sendPacket(std::move(statusPacket), _assignmentClientMonitorSocket);
 }

@ -186,7 +208,7 @@ void AssignmentClient::sendAssignmentRequest() {

        auto nodeList = DependencyManager::get<NodeList>();

-        if (_assignmentServerHostname == "localhost") {
+        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)) {
@ -271,10 +293,10 @@ void AssignmentClient::handleCreateAssignmentPacket(QSharedPointer<ReceivedMessa

 void AssignmentClient::handleStopNodePacket(QSharedPointer<ReceivedMessage> message) {
    const SockAddr& 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 {
@ -308,7 +330,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());

@ -329,6 +351,48 @@ void AssignmentClient::assignmentCompleted() {
    nodeList->setOwnerType(NodeType::Unassigned);
    nodeList->reset("Assignment completed");
    nodeList->resetNodeInterestSet();
-    
+
    _isAssigned = false;
 }
+
+#if defined(WEBRTC_DATA_CHANNELS)
+
+void AssignmentClient::handleWebRTCSignalingPacket(QSharedPointer<ReceivedMessage> message) {
+    auto messageString = message->readString();
+    auto json = QJsonDocument::fromJson(messageString.toUtf8()).object();
+    if (json.keys().contains("echo")) {
+        // Echo message back to sender.
+
+        if (!json.keys().contains("to") || !json.keys().contains("from")) {
+            qCDebug(assignment_client) << "Invalid WebRTC signaling echo message received.";
+            return;
+        }
+
+        // Swap to/from.
+        auto to = json.value("to");
+        json.insert("to", json.value("from"));
+        json.insert("from", to);
+
+        // Send back to sender via the Domain Server.
+        auto packetList = NLPacketList::create(PacketType::WebRTCSignaling, QByteArray(), true, true);
+        packetList->writeString(QJsonDocument(json).toJson(QJsonDocument::Compact));
+        auto nodeList = DependencyManager::get<NodeList>();
+        auto domainServerAddress = nodeList->getDomainHandler().getSockAddr();
+        nodeList->sendPacketList(std::move(packetList), domainServerAddress);
+
+    } else {
+        // WebRTC signaling message.
+        emit webrtcSignalingMessageFromUserClient(json);
+    }
+}
+
+// Sends a signaling message from the assignment client to the user client via the Domain Server.
+void AssignmentClient::sendSignalingMessageToUserClient(const QJsonObject& json) {
+    auto packetList = NLPacketList::create(PacketType::WebRTCSignaling, QByteArray(), true, true);
+    packetList->writeString(QJsonDocument(json).toJson(QJsonDocument::Compact));
+    auto nodeList = DependencyManager::get<NodeList>();
+    auto domainServerAddress = nodeList->getDomainHandler().getSockAddr();
+    nodeList->sendPacketList(std::move(packetList), domainServerAddress);
+}
+
+#endif
--- a/assignment-client/src/AssignmentClient.h
+++ b/assignment-client/src/AssignmentClient.h
@ -15,6 +15,9 @@

 #include <QtCore/QCoreApplication>
 #include <QtCore/QPointer>
+#include <QtCore/QSharedPointer>
+
+#include <shared/WebRTC.h>

 #include "ThreadedAssignment.h"

@ -24,24 +27,31 @@ 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();

+public slots:
+    void aboutToQuit();
+
 private slots:
    void sendAssignmentRequest();
    void assignmentCompleted();
    void handleAuthenticationRequest();
    void sendStatusPacketToACM();
    void stopAssignmentClient();
-
-public slots:
-    void aboutToQuit();
-
-private slots:
    void handleCreateAssignmentPacket(QSharedPointer<ReceivedMessage> message);
    void handleStopNodePacket(QSharedPointer<ReceivedMessage> message);
+#if defined(WEBRTC_DATA_CHANNELS)
+    void handleWebRTCSignalingPacket(QSharedPointer<ReceivedMessage> message);
+    void sendSignalingMessageToUserClient(const QJsonObject& json);
+#endif
+
+signals:
+#if defined(WEBRTC_DATA_CHANNELS)
+    void webrtcSignalingMessageFromUserClient(const QJsonObject& json);
+#endif

 private:
    void setUpStatusToMonitor();
@ -54,6 +64,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:
    SockAddr _assignmentClientMonitorSocket;
--- 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,10 @@ 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,
+        "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");
    parser.addOption(parentPIDOption);

@ -151,11 +156,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 +258,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);
    }
--- 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
--- a/assignment-client/src/AssignmentClientMonitor.cpp
+++ b/assignment-client/src/AssignmentClientMonitor.cpp
@ -42,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),
@ -52,7 +53,8 @@ AssignmentClientMonitor::AssignmentClientMonitor(const unsigned int numAssignmen
    _walletUUID(walletUUID),
    _assignmentServerHostname(assignmentServerHostname),
    _assignmentServerPort(assignmentServerPort),
-    _childMinListenPort(childMinListenPort)
+    _childMinListenPort(childMinListenPort),
+    _disableDomainPortAutoDiscovery(disableDomainPortAutoDiscovery)
 {
    qDebug() << "_requestAssignmentType =" << _requestAssignmentType;

@ -199,6 +201,9 @@ void AssignmentClientMonitor::spawnChildClient() {
        _childArguments.append("--" + ASSIGNMENT_TYPE_OVERRIDE_OPTION);
        _childArguments.append(QString::number(_requestAssignmentType));
    }
+    if (_disableDomainPortAutoDiscovery) {
+        _childArguments.append("--" + ASSIGNMENT_DISABLE_DOMAIN_AUTO_PORT_DISCOVERY);
+    }

    if (listenPort) {
        _childArguments.append("-" + ASSIGNMENT_CLIENT_LISTEN_PORT_OPTION);
@ -267,7 +272,7 @@ void AssignmentClientMonitor::spawnChildClient() {
            stderrPath = stderrPathTemp;
            stderrFilename = stderrFilenameTemp;
        }
-        
+
        qDebug() << "Child stdout being written to: " << stdoutFilename;
        qDebug() << "Child stderr being written to: " << stderrFilename;
    }
--- 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
@ -16,6 +17,7 @@
 #include <QtCore/qpointer.h>
 #include <QtCore/QProcess>
 #include <QtCore/QDateTime>
+#include <QtCore/QSharedPointer>
 #include <QDir>

 #include <Assignment.h>
@ -27,7 +29,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 +41,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 +82,7 @@ private:
    QSet<quint16> _childListenPorts;

    bool _wantsChildFileLogging { false };
+    bool _disableDomainPortAutoDiscovery { false };
 };

 #endif // hifi_AssignmentClientMonitor_h
--- a/assignment-client/src/AssignmentDynamicFactory.cpp
+++ b/assignment-client/src/AssignmentDynamicFactory.cpp
@ -13,7 +13,7 @@


 EntityDynamicPointer assignmentDynamicFactory(EntityDynamicType type, const QUuid& id, EntityItemPointer ownerEntity) {
-    return EntityDynamicPointer(new AssignmentDynamic(type, id, ownerEntity));
+    return std::make_shared<AssignmentDynamic>(type, id, ownerEntity);
 }

 EntityDynamicPointer AssignmentDynamicFactory::factory(EntityDynamicType type,
--- a/assignment-client/src/assets/AssetServer.h
+++ b/assignment-client/src/assets/AssetServer.h
@ -13,6 +13,7 @@
 #define hifi_AssetServer_h

 #include <QtCore/QDir>
+#include <QtCore/QSharedPointer>
 #include <QtCore/QThreadPool>
 #include <QRunnable>

--- a/assignment-client/src/audio/AudioMixer.cpp
+++ b/assignment-client/src/audio/AudioMixer.cpp
@ -76,11 +76,10 @@ AudioMixer::AudioMixer(ReceivedMessage& message) :
    };
    pluginManager->setPluginFilter(codecPluginFilter);

-    auto codecPlugins = pluginManager->getCodecPlugins();
-    for_each(codecPlugins.cbegin(), codecPlugins.cend(),
-        [&](const CodecPluginPointer& codec) {
-            _availableCodecs[codec->getName()] = codec;
-        });
+    const auto& codecPlugins = pluginManager->getCodecPlugins();
+    for(const auto& codec : codecPlugins) {
+        _availableCodecs[codec->getName()] = codec;
+    }

    auto nodeList = DependencyManager::get<NodeList>();
    auto& packetReceiver = nodeList->getPacketReceiver();
--- a/assignment-client/src/audio/AudioMixer.h
+++ b/assignment-client/src/audio/AudioMixer.h
@ -12,6 +12,8 @@
 #ifndef hifi_AudioMixer_h
 #define hifi_AudioMixer_h

+#include <QtCore/QSharedPointer>
+
 #include <AABox.h>
 #include <AudioHRTF.h>
 #include <AudioRingBuffer.h>
--- a/assignment-client/src/audio/AudioMixerClientData.h
+++ b/assignment-client/src/audio/AudioMixerClientData.h
@ -20,6 +20,7 @@
 #endif

 #include <QtCore/QJsonObject>
+#include <QtCore/QSharedPointer>

 #include <AABox.h>
 #include <AudioHRTF.h>
--- a/assignment-client/src/audio/AvatarAudioStream.h
+++ b/assignment-client/src/audio/AvatarAudioStream.h
@ -23,9 +23,7 @@ public:
    AvatarAudioStream(bool isStereo, int numStaticJitterFrames = -1);

 private:
-    // disallow copying of AvatarAudioStream objects
-    AvatarAudioStream(const AvatarAudioStream&);
-    AvatarAudioStream& operator= (const AvatarAudioStream&);
+    Q_DISABLE_COPY(AvatarAudioStream)

    int parseStreamProperties(PacketType type, const QByteArray& packetAfterSeqNum, int& numAudioSamples) override;
 };
--- a/assignment-client/src/avatars/AvatarMixer.cpp
+++ b/assignment-client/src/avatars/AvatarMixer.cpp
@ -1062,7 +1062,7 @@ void AvatarMixer::parseDomainServerSettings(const QJsonObject& domainSettings) {

    static const QString AVATAR_WHITELIST_OPTION = "avatar_whitelist";
    _slaveSharedData.skeletonURLWhitelist = avatarMixerGroupObject[AVATAR_WHITELIST_OPTION]
-        .toString().split(',', QString::KeepEmptyParts);
+        .toString().split(',', Qt::KeepEmptyParts);

    static const QString REPLACEMENT_AVATAR_OPTION = "replacement_avatar";
    _slaveSharedData.skeletonReplacementURL = avatarMixerGroupObject[REPLACEMENT_AVATAR_OPTION]
--- a/assignment-client/src/avatars/AvatarMixer.h
+++ b/assignment-client/src/avatars/AvatarMixer.h
@ -16,6 +16,8 @@
 #ifndef hifi_AvatarMixer_h
 #define hifi_AvatarMixer_h

+#include <QtCore/QSharedPointer>
+
 #include <set>
 #include <shared/RateCounter.h>
 #include <PortableHighResolutionClock.h>
--- a/assignment-client/src/avatars/AvatarMixerClientData.h
+++ b/assignment-client/src/avatars/AvatarMixerClientData.h
@ -19,6 +19,7 @@
 #include <queue>

 #include <QtCore/QJsonObject>
+#include <QtCore/QSharedPointer>
 #include <QtCore/QUrl>

 #include "MixerAvatar.h"
--- a/assignment-client/src/entities/EntityServer.cpp
+++ b/assignment-client/src/entities/EntityServer.cpp
@ -94,7 +94,7 @@ std::unique_ptr<OctreeQueryNode> EntityServer::createOctreeQueryNode() {
 }

 OctreePointer EntityServer::createTree() {
-    EntityTreePointer tree = EntityTreePointer(new EntityTree(true));
+    EntityTreePointer tree = std::make_shared<EntityTree>(true);
    tree->createRootElement();
    tree->addNewlyCreatedHook(this);
    if (!_entitySimulation) {
--- a/assignment-client/src/entities/EntityServer.h
+++ b/assignment-client/src/entities/EntityServer.h
@ -14,6 +14,8 @@

 #include "../octree/OctreeServer.h"

+#include <QtCore/QSharedPointer>
+
 #include <memory>

 #include <EntityItem.h>
--- a/assignment-client/src/entities/EntityTreeHeadlessViewer.h
+++ b/assignment-client/src/entities/EntityTreeHeadlessViewer.h
@ -54,7 +54,7 @@ public:

 protected:
    virtual OctreePointer createTree() override {
-        EntityTreePointer newTree = EntityTreePointer(new EntityTree(true));
+        EntityTreePointer newTree = std::make_shared<EntityTree>(true);
        newTree->createRootElement();
        return newTree;
    }
--- a/assignment-client/src/messages/MessagesMixer.h
+++ b/assignment-client/src/messages/MessagesMixer.h
@ -15,6 +15,8 @@
 #ifndef hifi_MessagesMixer_h
 #define hifi_MessagesMixer_h

+#include <QtCore/QSharedPointer>
+
 #include <ThreadedAssignment.h>

 /// Handles assignments of type MessagesMixer - distribution of avatar data to various clients
--- a/assignment-client/src/octree/OctreeHeadlessViewer.h
+++ b/assignment-client/src/octree/OctreeHeadlessViewer.h
@ -12,6 +12,8 @@
 #ifndef hifi_OctreeHeadlessViewer_h
 #define hifi_OctreeHeadlessViewer_h

+#include <QtCore/QSharedPointer>
+
 #include <OctreeProcessor.h>
 #include <OctreeQuery.h>

--- a/assignment-client/src/octree/OctreeInboundPacketProcessor.h
+++ b/assignment-client/src/octree/OctreeInboundPacketProcessor.h
@ -14,6 +14,8 @@
 #ifndef hifi_OctreeInboundPacketProcessor_h
 #define hifi_OctreeInboundPacketProcessor_h

+#include <QtCore/QSharedPointer>
+
 #include <ReceivedPacketProcessor.h>

 #include "SequenceNumberStats.h"
--- a/assignment-client/src/octree/OctreeServer.h
+++ b/assignment-client/src/octree/OctreeServer.h
@ -17,6 +17,7 @@
 #include <QStringList>
 #include <QDateTime>
 #include <QtCore/QCoreApplication>
+#include <QtCore/QSharedPointer>

 #include <HTTPManager.h>

--- a/assignment-client/src/scripts/EntityScriptServer.cpp
+++ b/assignment-client/src/scripts/EntityScriptServer.cpp
@ -399,10 +399,10 @@ void EntityScriptServer::nodeKilled(SharedNodePointer killedNode) {
 void EntityScriptServer::negotiateAudioFormat() {
    auto nodeList = DependencyManager::get<NodeList>();
    auto negotiateFormatPacket = NLPacket::create(PacketType::NegotiateAudioFormat);
-    auto codecPlugins = PluginManager::getInstance()->getCodecPlugins();
+    const auto& codecPlugins = PluginManager::getInstance()->getCodecPlugins();
    quint8 numberOfCodecs = (quint8)codecPlugins.size();
    negotiateFormatPacket->writePrimitive(numberOfCodecs);
-    for (auto& plugin : codecPlugins) {
+    for (const auto& plugin : codecPlugins) {
        auto codecName = plugin->getName();
        negotiateFormatPacket->writeString(codecName);
    }
@ -433,8 +433,8 @@ void EntityScriptServer::selectAudioFormat(const QString& selectedCodecName) {
        _codec = nullptr;
    }

-    auto codecPlugins = PluginManager::getInstance()->getCodecPlugins();
-    for (auto& plugin : codecPlugins) {
+    const auto& codecPlugins = PluginManager::getInstance()->getCodecPlugins();
+    for (const auto& plugin : codecPlugins) {
        if (_selectedCodecName == plugin->getName()) {
            _codec = plugin;
            _encoder = plugin->createEncoder(AudioConstants::SAMPLE_RATE, AudioConstants::MONO);
--- a/assignment-client/src/scripts/EntityScriptServer.h
+++ b/assignment-client/src/scripts/EntityScriptServer.h
@ -16,6 +16,7 @@
 #include <vector>

 #include <QtCore/QObject>
+#include <QtCore/QSharedPointer>
 #include <QtCore/QUuid>

 #include <EntityEditPacketSender.h>
--- a/cmake/compiler.cmake
+++ b/cmake/compiler.cmake
@ -110,3 +110,5 @@ if (APPLE)
    set(CMAKE_OSX_SYSROOT ${_OSX_DESIRED_SDK_PATH}/MacOSX${OSX_SDK}.sdk)
  endif ()
 endif ()
+
+message("CXXFLAGS: ${CXXFLAGS}")
--- a/cmake/macros/TargetOpenSSL.cmake
+++ b/cmake/macros/TargetOpenSSL.cmake
@ -12,7 +12,7 @@ macro(TARGET_OPENSSL)
        set(OPENSSL_LIBRARIES "${OPENSSL_INSTALL_DIR}/lib/libcrypto.a;${OPENSSL_INSTALL_DIR}/lib/libssl.a" CACHE STRING INTERNAL)
    else()
    	# using VCPKG for OpenSSL
-        find_package(OpenSSL REQUIRED)
+        find_package(OpenSSL 1.1.0 REQUIRED)
    endif()

    include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}")
--- a/cmake/macros/TargetWebRTC.cmake
+++ b/cmake/macros/TargetWebRTC.cmake
@ -13,6 +13,9 @@ macro(TARGET_WEBRTC)
        # set(WEBRTC_LIBRARY_DEBUG ${INSTALL_DIR}/debug/lib/libwebrtc.a)
        # set(WEBRTC_LIBRARY_RELEASE ${INSTALL_DIR}/lib/libwebrtc.a)
        # select_library_configurations(WEBRTC)
+    elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
+        # WebRTC is basically impossible to build on aarch64 Linux.
+        # I am looking at https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing for an alternative.
    else()
        set(WEBRTC_INCLUDE_DIRS "${VCPKG_INSTALL_ROOT}/include/webrtc")
        target_include_directories(${TARGET_NAME} SYSTEM PUBLIC ${WEBRTC_INCLUDE_DIRS})
--- a/cmake/ports/bullet3/portfile.cmake
+++ b/cmake/ports/bullet3/portfile.cmake
@ -15,6 +15,7 @@

 include(vcpkg_common_functions)

+
 if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
    message(WARNING "Dynamic not supported, building static")
    set(VCPKG_LIBRARY_LINKAGE static)
@ -30,6 +31,32 @@ vcpkg_from_github(
    PATCHES "bullet-git-fix-build-clang-8.patch"
 )

+if(WIN32)
+    set(VIRCADIA_BULLET_OPTIONS "")
+else()
+    if(EXISTS "${VCPKG_ROOT_DIR}/_env/VIRCADIA_OPTIMIZE.txt")
+        file(READ "${VCPKG_ROOT_DIR}/_env/VIRCADIA_OPTIMIZE.txt" VIRCADIA_OPTIMIZE)
+    endif()
+    if(EXISTS "${VCPKG_ROOT_DIR}/_env/VIRCADIA_CPU_ARCHITECTURE.txt")
+        file(READ "${VCPKG_ROOT_DIR}/_env/VIRCADIA_CPU_ARCHITECTURE.txt" VIRCADIA_CPU_ARCHITECTURE)
+    endif()
+
+
+    if(VIRCADIA_OPTIMIZE)
+        set(VIRCADIA_BULLET_OPTIONS "-DCMAKE_BUILD_TYPE=Release")
+    else()
+        set(VIRCADIA_BULLET_OPTIONS "-DCMAKE_BUILD_TYPE=RelWithDebInfo")
+    endif()
+
+    set(VIRCADIA_BULLET_OPTIONS "${VIRCADIA_BULLET_OPTIONS}")
+
+    if(DEFINED VIRCADIA_CPU_ARCHITECTURE)
+        set(VIRCADIA_BULLET_OPTIONS "${VIRCADIA_BULLET_OPTIONS} -DCMAKE_CXX_FLAGS=\"${VIRCADIA_CPU_ARCHITECTURE}\" -DCMAKE_C_FLAGS=\"${VIRCADIA_CPU_ARCHITECTURE}\" ")
+    endif()
+endif()
+
+message("Optimization options for Bullet: ${VIRCADIA_BULLET_OPTIONS}")
+
 vcpkg_configure_cmake(
    SOURCE_PATH ${SOURCE_PATH}
    OPTIONS
@ -46,6 +73,7 @@ vcpkg_configure_cmake(
        -DBUILD_UNIT_TESTS=OFF
        -DBUILD_SHARED_LIBS=ON
        -DINSTALL_LIBS=ON
+        ${VIRCADIA_BULLET_OPTIONS}
 )

 vcpkg_install_cmake()
@ -58,4 +86,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/bullet/BulletInverseDynamics
 vcpkg_copy_pdbs()

 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/bullet3 RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/bullet3 RENAME copyright)
--- a/cmake/ports/hifi-deps/CONTROL
+++ b/cmake/ports/hifi-deps/CONTROL
@ -1,4 +1,4 @@
 Source: hifi-deps
 Version: 0.1.5-github-actions
 Description: Collected dependencies for High Fidelity applications
-Build-Depends: bullet3, draco, etc2comp, glad, glm, nvtt, openexr (!android), openssl (windows), opus, polyvox, tbb (!android), vhacd, webrtc (!android), zlib
+Build-Depends: bullet3, draco, etc2comp, glad, glm, nvtt, openexr (!android), openssl (windows), opus, polyvox, tbb (!android), vhacd, webrtc (!android|!(linux&arm)), zlib
--- a/cmake/ports/openvr/CONTROL
+++ b/cmake/ports/openvr/CONTROL
@ -1,3 +1,3 @@
 Source: openvr
-Version: 1.0.16
+Version: 1.16.8
 Description: an API and runtime that allows access to VR hardware from multiple vendors without requiring that applications have specific knowledge of the hardware they are targeting.
--- a/cmake/ports/openvr/portfile.cmake
+++ b/cmake/ports/openvr/portfile.cmake
@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO ValveSoftware/openvr
-    REF v1.11.11
-    SHA512 25bddb0e82eea091fe5101d0d3de1de7bb81b4504adc0c8d8e687d2502c0167bc5a11e68bc343d7563fb4db7c917e9d0e2ea99bc1d8016d479874b0c6bd7f121
+    REF v1.16.8
+    SHA512 bc65fd2fc2aab870c7fee98f5211b7d88cd30511ce5b23fa2ac05454969b6ee56b42e422e44a16a833b317bb1328e0ed986c926e3d78abddf5fd5788ff74de91
    HEAD_REF master
 )

--- a/cmake/ports/opus/portfile.cmake
+++ b/cmake/ports/opus/portfile.cmake
@ -12,7 +12,37 @@ vcpkg_from_github(
  HEAD_REF
  master)

-vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA)
+if(WIN32)
+    set(VIRCADIA_OPUS_OPTIONS "")
+else()
+    if(EXISTS "${VCPKG_ROOT_DIR}/_env/VIRCADIA_OPTIMIZE.txt")
+        file(READ "${VCPKG_ROOT_DIR}/_env/VIRCADIA_OPTIMIZE.txt" VIRCADIA_OPTIMIZE)
+    endif()
+    if(EXISTS "${VCPKG_ROOT_DIR}/_env/VIRCADIA_CPU_ARCHITECTURE.txt")
+        file(READ "${VCPKG_ROOT_DIR}/_env/VIRCADIA_CPU_ARCHITECTURE.txt" VIRCADIA_CPU_ARCHITECTURE)
+    endif()
+
+    if(VIRCADIA_OPTIMIZE)
+        set(VIRCADIA_OPUS_OPTIONS "-DCMAKE_BUILD_TYPE=Release")
+    else()
+        set(VIRCADIA_OPUS_OPTIONS "-DCMAKE_BUILD_TYPE=RelWithDebInfo")
+    endif()
+
+    set(VIRCADIA_OPUS_OPTIONS "${VIRCADIA_OPUS_OPTIONS}")
+
+    if(DEFINED VIRCADIA_CPU_ARCHITECTURE)
+        set(VIRCADIA_OPUS_OPTIONS "${VIRCADIA_OPUS_OPTIONS} -DCMAKE_CXX_FLAGS=\"${VIRCADIA_CPU_ARCHITECTURE}\" -DCMAKE_C_FLAGS=\"${VIRCADIA_CPU_ARCHITECTURE}\" ")
+    endif()
+endif()
+
+message("Optimization options for Opus: ${VIRCADIA_OPUS_OPTIONS}")
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS ${VIRCADIA_OPUS_OPTIONS}
+)
+
 vcpkg_install_cmake()
 vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Opus)
 vcpkg_copy_pdbs()
--- a/cmake/ports/webrtc/CONTROL
+++ b/cmake/ports/webrtc/CONTROL
@ -1,3 +1,3 @@
 Source: webrtc
-Version: 20190626
+Version: 20210105
 Description: WebRTC
--- a/cmake/ports/webrtc/README.md
+++ b/cmake/ports/webrtc/README.md
@ -0,0 +1,215 @@
+# WebRTC
+
+WebRTC Information:
+- https://webrtc.org/
+- https://webrtc.googlesource.com/src
+- https://webrtc.googlesource.com/src/+/refs/heads/master/docs/native-code/index.md
+  - https://webrtc.googlesource.com/src/+/refs/heads/master/docs/native-code/development/prerequisite-sw/index.md
+  - https://webrtc.googlesource.com/src/+/refs/heads/master/docs/native-code/development/index.md
+- https://www.chromium.org/developers/calendar
+- https://github.com/microsoft/winrtc
+- https://docs.microsoft.com/en-us/winrtc/getting-started
+- https://groups.google.com/g/discuss-webrtc \
+  See "PSA" posts for release information.
+- https://bugs.chromium.org/p/webrtc/issues/list
+- https://stackoverflow.com/questions/27809193/webrtc-not-building-for-windows
+- https://github.com/aisouard/libwebrtc/issues/57
+
+## Windows - M84
+
+WebRTC's M84 release is currently used because it corresponded to Microsoft's latest WinRTC release at the time of development,
+and WinRTC is a source of potentially useful patches.
+
+The following notes document how the M84-based Windows VCPKG was created, using Visual Studio 2019.
+
+### Set Up depot_tools
+
+Install Google's depot_tools.
+- Download depot_tools.zip.
+- Extract somewhere.
+- Add the extracted directory to the start of the system `PATH` environment variable.
+
+Configure depot_tools.
+- Set an environment variable `DEPOT_TOOLS_WIN_TOOLCHAIN=0`
+- Set an environment variable `GYP_MSVS_VERSION=2019`
+
+Initialize depot_tools.
+- VS2019 developer command prompt in the directory where the source tree will be created.  
+- `gclient`
+
+### Get the Code
+
+Fetch the code into a *\src* subdirectory. This may take some time!
+- `fetch --nohooks webrtc`
+
+Switch to the M84 branch.
+- `cd src`
+- `git checkout branch-heads/4147`
+
+Fetch all the subrepositories.  
+- `gclient sync -D -r branch-heads/4147`
+
+### Patch the Code
+
+#### Modify compiler switches
+- Edit *build\config\win\BUILD.gn*:
+  - Change all `/MT` to `/MD`, and `/MTd` to `/MDd`.
+  - Change all `cflags = [ "/MDd" ]` to `[ "/MDd", "-D_ITERATOR_DEBUG_LEVEL=2", "-D_HAS_ITERATOR_DEBUGGING=1" ]`.
+- Edit *build\config\compiler\BUILD.gn*:\
+  Change:
+  ```
+    if (is_win) {
+      if (is_clang) {
+        cflags = [ "/Z7" ]  # Debug information in the .obj files.
+      } else {
+        cflags = [ "/Zi" ]  # Produce PDB file, no edit and continue.
+      }
+  ```
+  to:
+  ```
+    if (is_win) {
+      if (is_clang) {
+        cflags = [ "/Z7", "/std:c++17", "/Zc:__cplusplus" ]  # Debug information in the .obj files.
+      } else {
+        cflags = [ "/Zi", "/std:c++17", "/Zc:__cplusplus" ]  # Produce PDB file, no edit and continue.
+      }
+  ```
+
+#### H265 Codec Fixes  
+https://bugs.webrtc.org/9213#c13
+- Edit the following files:
+  - *modules\video_coding\codecs\h264\h264_color_space.h*
+  - *modules\video_coding\codecs\h264\h264_decoder_impl.h*
+  - *modules\video_coding\codecs\h264\h264_encoder_impl.h*
+  In each, comment out the following lines:
+  ```
+  #if defined(WEBRTC_WIN) && !defined(__clang__)
+  #error "See: bugs.webrtc.org/9213#c13."
+  #endif
+  ```
+- Edit *third_party\ffmpeg\libavcodec\fft_template.c*:\
+  Comment out all of `ff_fft_init` except the fail clause at the end.
+- Edit *third_party\ffmpeg\libavcodec\pcm.c*:\
+  Comment out last line, containing `PCM Archimedes VIDC`.
+- Edit *third_party\ffmpeg\libavutil\x86\imgutils_init.c*:\
+  Add the following method to the end of the file:
+  ```
+  void avpriv_emms_asm(void) {}  // Fix missing symbol in FFMPEG.
+  ```
+
+#### Exclude BoringSSL
+A separate OpenSSL VCPKG is used for building Vircadia.
+The following patches are needed even though SSL is excluded in the `gn gen` build commands.
+- Rename *third_party\boringssl* to *third_party\boringssl-NO*.
+- Edit *third_party\libsrtp\BUILD.gn:\
+  Change:
+  ```
+  public_deps = [
+    "//third_party/boringssl:boringssl",
+  ]
+  ```
+  To:
+  ```
+  public_deps = [
+    # "//third_party/boringssl:boringssl",
+  ]
+  ```
+
+- Edit *third_party\usrsctp\BUILD.gn*:\
+  Change:
+  ```
+  deps = [ "//third_party/boringssl" ]
+  ```
+  To:
+  ```
+  deps = [
+    # "//third_party/boringssl"
+  ]
+  ```
+- Edit *base\BUILD.gn*:\
+  In the code under:
+  ```
+  # Use the base implementation of hash functions when building for
+  # NaCl. Otherwise, use boringssl.
+  ```
+  Change:
+  ```
+  if (is_nacl) {
+  ```
+  To:
+  ```
+  # if (is_nacl) {
+  if (true) {
+  ```
+- Edit *rtc_base\BUILD.gn*:\
+  Change:  
+  ```
+  if (rtc_build_ssl) {
+    deps += [ "//third_party/boringssl" ]
+  } else {
+  ```
+  To:  
+  ```
+  if (rtc_build_ssl) {
+    # deps += [ "//third_party/boringssl" ]
+  } else {
+  ```
+
+### Set Up OpenSSL
+
+Do one of the following to provide OpenSSL for building against:
+a. If you have built Vircadia, find the **HIFI_VCPKG_BASE** subdirectory used in your build and make note of the path to and 
+including the *installed\x64-windows\include* directory (which includes an *openssl* directory).
+a. Follow https://github.com/vircadia/vcpkg to install *vcpkg* and then *openssl*. Make note of the path to and including the 
+*packages\openssl-windows_x64-windows\include* directory (which includes an *openssl* directory).
+
+Copy the *\<path\>\openssl* directory to the following locations (i.e., add as *openssl* subdirectories):
+- *third_party\libsrtp\crypto\include*
+- *third_party\usrsctp\usrsctplib\usrsctplib*
+
+Also use the path in the `gn gen` commands, below, making sure to escape `\`s as `\\`s.
+
+### Build and Package
+
+Use a VS2019 developer command prompt in the *src* directory.
+
+Create a release build of the WebRTC library:
+- `gn gen --ide=vs2019 out\Release --filters=//:webrtc "--args=is_debug=false is_clang=false use_custom_libcxx=false libcxx_is_shared=true symbol_level=2 use_lld=false rtc_include_tests=false rtc_build_tools=false rtc_build_examples=false proprietary_codecs=true rtc_use_h264=true enable_libaom=false rtc_enable_protobuf=false rtc_build_ssl=false rtc_ssl_root=\"<path>\""`
+- `ninja -C out\Release`
+
+Create a debug build of the WebRTC library:
+- `gn gen --ide=vs2019 out\Debug --filters=//:webrtc "--args=is_debug=true is_clang=false use_custom_libcxx=false libcxx_is_shared=true enable_iterator_debugging=true use_lld=false rtc_include_tests=false rtc_build_tools=false rtc_build_examples=false proprietary_codecs=true rtc_use_h264=true enable_libaom=false rtc_enable_protobuf=false rtc_build_ssl=false rtc_ssl_root=\"<path>\""`
+- `ninja -C out\Debug`
+
+Create VCPKG file:
+- Assemble files in VCPKG directory structure: Use the *copy-VCPKG-files-win.cmd* batch file per instructions in it.  
+`cd ..`\
+`copy-VCPKG-files-win`
+- Zip up the VCPKG *webrtc* directory created by the batch file.  
+`cd vcpkg`\
+`7z a -tzip webrtc-m84-yyyymmdd-windows.zip webrtc`
+- Calculate the SHA512 of the zip file. E.g., using a Windows PowerShell command window:\
+  `Get-FileHash <filename> -Algorithm SHA512 | Format-List`
+- Convert the SHA512 to lower case. E.g., using Microsoft Word, select the SHA512 text and use Shift-F3 to change the case.
+- Host the zip file on the Web.
+- Update *CONTROL* and *portfile.cmake* with version number (revision date), zip file Web URL, and SHA512.
+
+### Tidying up
+
+Disable the depot_tools:
+- Rename the *depot_tools* directory so that these tools don't interfere with the rest of your development environment for 
+  other work.
+
+
+## Linux - M81
+
+The original, High Fidelity-provided WebRTC VCPKG library is used for AEC (audio echo cancellation) only.
+
+**TODO:** Update to M84 and include WebRTC components per Windows WebRTC.
+
+
+## MacOS - M78
+
+The original, High Fidelity-provided WebRTC VCPKG library is used for AEC (audio echo cancellation) only.
+
+**TODO:** Update to M84 and include WebRTC components per Windows WebRTC.
--- a/cmake/ports/webrtc/copy-VCPKG-file-win.cmd
+++ b/cmake/ports/webrtc/copy-VCPKG-file-win.cmd
@ -0,0 +1,36 @@
+rem Copy this file to a directory above the WebRTC \src directory and run it from there in a command window.
+set WEBRTC_SRC_DIR=src
+set RELEASE_LIB_DIR=%WEBRTC_SRC_DIR%\out\Release\obj
+set DEBUG_LIB_DIR=%WEBRTC_SRC_DIR%\out\Debug\obj
+set VCPKG_TGT_DIR=vcpkg
+
+if exist %VCPKG_TGT_DIR% rd /s /q %VCPKG_TGT_DIR%
+mkdir %VCPKG_TGT_DIR%
+
+rem License and .lib files
+mkdir %VCPKG_TGT_DIR%\webrtc\share\webrtc\
+copy %WEBRTC_SRC_DIR%\LICENSE %VCPKG_TGT_DIR%\webrtc\share\webrtc\copyright
+xcopy /v %RELEASE_LIB_DIR%\webrtc.lib %VCPKG_TGT_DIR%\webrtc\lib\
+xcopy /v %DEBUG_LIB_DIR%\webrtc.lib %VCPKG_TGT_DIR%\webrtc\debug\lib\
+
+rem Header files
+mkdir %VCPKG_TGT_DIR%\webrtc\include\webrtc\
+copy %WEBRTC_SRC_DIR%\common_types.h %VCPKG_TGT_DIR%\webrtc\include\webrtc
+xcopy /v /s /i %WEBRTC_SRC_DIR%\api\*.h %VCPKG_TGT_DIR%\webrtc\include\webrtc\api
+xcopy /v /s /i %WEBRTC_SRC_DIR%\audio\*.h %VCPKG_TGT_DIR%\webrtc\include\webrtc\audio
+xcopy /v /s /i %WEBRTC_SRC_DIR%\base\*.h %VCPKG_TGT_DIR%\webrtc\include\webrtc\base
+xcopy /v /s /i %WEBRTC_SRC_DIR%\call\*.h %VCPKG_TGT_DIR%\webrtc\include\webrtc\call
+xcopy /v /s /i %WEBRTC_SRC_DIR%\common_audio\*.h %VCPKG_TGT_DIR%\webrtc\include\webrtc\common_audio
+xcopy /v /s /i %WEBRTC_SRC_DIR%\common_video\*.h %VCPKG_TGT_DIR%\webrtc\include\webrtc\common_video
+xcopy /v /s /i %WEBRTC_SRC_DIR%\logging\*.h %VCPKG_TGT_DIR%\webrtc\include\webrtc\logging
+xcopy /v /s /i %WEBRTC_SRC_DIR%\media\*.h %VCPKG_TGT_DIR%\webrtc\include\webrtc\media
+xcopy /v /s /i %WEBRTC_SRC_DIR%\modules\*.h %VCPKG_TGT_DIR%\webrtc\include\webrtc\modules
+xcopy /v /s /i %WEBRTC_SRC_DIR%\p2p\*.h %VCPKG_TGT_DIR%\webrtc\include\webrtc\p2p
+xcopy /v /s /i %WEBRTC_SRC_DIR%\pc\*.h %VCPKG_TGT_DIR%\webrtc\include\webrtc\pc
+xcopy /v /s /i %WEBRTC_SRC_DIR%\rtc_base\*.h %VCPKG_TGT_DIR%\webrtc\include\webrtc\rtc_base
+xcopy /v /s /i %WEBRTC_SRC_DIR%\rtc_tools\*.h %VCPKG_TGT_DIR%\webrtc\include\webrtc\rtc_tools
+xcopy /v /s /i %WEBRTC_SRC_DIR%\stats\*.h %VCPKG_TGT_DIR%\webrtc\include\webrtc\stats
+xcopy /v /s /i %WEBRTC_SRC_DIR%\system_wrappers\*.h %VCPKG_TGT_DIR%\webrtc\include\webrtc\system_wrappers
+xcopy /v /s /i %WEBRTC_SRC_DIR%\third_party\abseil-cpp\absl\*.h %VCPKG_TGT_DIR%\webrtc\include\webrtc\absl
+xcopy /v /s /i %WEBRTC_SRC_DIR%\third_party\libyuv\include\libyuv\*.h %VCPKG_TGT_DIR%\webrtc\include\webrtc\libyuv
+xcopy /v /s /i %WEBRTC_SRC_DIR%\video\*.h %VCPKG_TGT_DIR%\webrtc\include\webrtc\video
--- a/cmake/ports/webrtc/portfile.cmake
+++ b/cmake/ports/webrtc/portfile.cmake
@ -1,5 +1,5 @@
 include(vcpkg_common_functions)
-set(WEBRTC_VERSION 20190626)
+set(WEBRTC_VERSION 20210105)
 set(MASTER_COPY_SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src)

 file(READ "${VCPKG_ROOT_DIR}/_env/EXTERNAL_BUILD_ASSETS.txt" EXTERNAL_BUILD_ASSETS)
@ -9,9 +9,9 @@ if (ANDROID)
 elseif (WIN32)
    vcpkg_download_distfile(
        WEBRTC_SOURCE_ARCHIVE
-        URLS "${EXTERNAL_BUILD_ASSETS}/seth/webrtc-20190626-windows.zip"
-        SHA512 c0848eddb1579b3bb0496b8785e24f30470f3c477145035fd729264a326a467b9467ae9f426aa5d72d168ad9e9bf2c279150744832736bdf39064d24b04de1a3
-        FILENAME webrtc-20190626-windows.zip
+        URLS "${EXTERNAL_BUILD_ASSETS}/dependencies/vcpkg/webrtc-m84-20210105-windows.zip"
+        SHA512 12847f7e9df2e0539a6b017db88012a8978b1aa37ff2e8dbf019eb7438055395fdda3a74dc669b0a30330973a83bc57e86eca6f59b1c9eff8e2145a7ea4a532a
+        FILENAME webrtc-m84-20210105-windows.zip
    )
 elseif (APPLE)
    vcpkg_download_distfile(
@ -24,9 +24,9 @@ else ()
    # else Linux desktop
    vcpkg_download_distfile(
        WEBRTC_SOURCE_ARCHIVE
-        URLS "${EXTERNAL_BUILD_ASSETS}/seth/webrtc-20190626-linux.tar.gz"
-        SHA512 07d7776551aa78cb09a3ef088a8dee7762735c168c243053b262083d90a1d258cec66dc386f6903da5c4461921a3c2db157a1ee106a2b47e7756cb424b66cc43
-        FILENAME webrtc-20190626-linux.tar.gz
+        URLS "${EXTERNAL_BUILD_ASSETS}/dependencies/vcpkg/webrtc-m84-gcc-linux.tar.xz"
+        SHA512 f7c5f93566e2e79241cbb9628ab47302dd48739bb6a022c351be75553060fac4221892d094306a572cb3ec94c5031d7e812f07e7b3c0102be8c01b8c231f8ea0
+        FILENAME webrtc-m84-gcc-linux.tar.xz
    )
 endif ()

--- a/domain-server/resources/describe-settings.json
+++ b/domain-server/resources/describe-settings.json
@ -1,5 +1,5 @@
 {
-  "version": 2.5,
+  "version": 2.6,
  "settings": [
    {
      "name": "metaverse",
@ -73,6 +73,28 @@
        }
      ]
    },
+    {
+      "name": "webrtc",
+      "label": "Networking / WebRTC",
+      "settings": [
+        {
+          "name": "enable_webrtc",
+          "label": "Enable WebRTC Client Connections",
+          "help": "Allow web clients to connect over WebRTC data channels.",
+          "type": "checkbox",
+          "default": false,
+          "advanced": true
+        },
+        {
+            "name": "enable_webrtc_websocket_ssl",
+            "label": "Enable WebRTC WebSocket SSL",
+            "help": "Use secure WebSocket (wss:// protocol) for WebRTC signaling channel. If \"on\", the key, cert, and CA files are expected to be in the local Vircadia app directory, in a /domain-server/ subdirectory with filenames vircadia-cert.key, vircadia-cert.crt, and vircadia-crt-ca.crt.",
+            "type": "checkbox",
+            "default": false,
+            "advanced": true
+        }
+      ]
+    },
    {
      "name": "authentication",
      "label": "Networking / WordPress OAuth2",
--- a/domain-server/resources/web/web-new/.editorconfig
+++ b/domain-server/resources/web/web-new/.editorconfig
@ -0,0 +1,9 @@
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 4
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
--- a/domain-server/resources/web/web-new/.eslintignore
+++ b/domain-server/resources/web/web-new/.eslintignore
@ -0,0 +1,9 @@
+/dist
+/src-bex/www
+/src-capacitor
+/src-cordova
+/.quasar
+/node_modules
+.eslintrc.js
+babel.config.js
+/src-ssr
--- a/domain-server/resources/web/web-new/.eslintrc.js
+++ b/domain-server/resources/web/web-new/.eslintrc.js
@ -0,0 +1,112 @@
+const { resolve } = require('path');
+module.exports = {
+    // https://eslint.org/docs/user-guide/configuring#configuration-cascading-and-hierarchy
+    // This option interrupts the configuration hierarchy at this file
+    // Remove this if you have an higher level ESLint config file (it usually happens into a monorepos)
+    root: true,
+
+    // https://eslint.vuejs.org/user-guide/#how-to-use-custom-parser
+    // Must use parserOptions instead of "parser" to allow vue-eslint-parser to keep working
+    // `parser: 'vue-eslint-parser'` is already included with any 'plugin:vue/**' config and should be omitted
+    parserOptions: {
+        // https://github.com/typescript-eslint/typescript-eslint/tree/master/packages/parser#configuration
+        // https://github.com/TypeStrong/fork-ts-checker-webpack-plugin#eslint
+        // Needed to make the parser take into account 'vue' files
+        extraFileExtensions: ['.vue'],
+        parser: '@typescript-eslint/parser',
+        project: resolve(__dirname, './tsconfig.json'),
+        tsconfigRootDir: __dirname,
+        ecmaVersion: 2018, // Allows for the parsing of modern ECMAScript features
+        sourceType: 'module' // Allows for the use of imports
+    },
+
+    env: {
+        browser: true
+    },
+
+    // Rules order is important, please avoid shuffling them
+    extends: [
+        // Base ESLint recommended rules
+        // 'eslint:recommended',
+
+        // https://github.com/typescript-eslint/typescript-eslint/tree/master/packages/eslint-plugin#usage
+        // ESLint typescript rules
+        'plugin:@typescript-eslint/recommended',
+        // consider disabling this class of rules if linting takes too long
+        'plugin:@typescript-eslint/recommended-requiring-type-checking',
+
+        // Uncomment any of the lines below to choose desired strictness,
+        // but leave only one uncommented!
+        // See https://eslint.vuejs.org/rules/#available-rules
+        'plugin:vue/vue3-essential', // Priority A: Essential (Error Prevention)
+        // 'plugin:vue/vue3-strongly-recommended', // Priority B: Strongly Recommended (Improving Readability)
+        // 'plugin:vue/vue3-recommended', // Priority C: Recommended (Minimizing Arbitrary Choices and Cognitive Overhead)
+
+        'standard'
+
+    ],
+
+    plugins: [
+        // required to apply rules which need type information
+        '@typescript-eslint',
+
+        // https://eslint.vuejs.org/user-guide/#why-doesn-t-it-work-on-vue-file
+        // required to lint *.vue files
+        'vue',
+
+    ],
+
+    globals: {
+        ga: 'readonly', // Google Analytics
+        cordova: 'readonly',
+        __statics: 'readonly',
+        __QUASAR_SSR__: 'readonly',
+        __QUASAR_SSR_SERVER__: 'readonly',
+        __QUASAR_SSR_CLIENT__: 'readonly',
+        __QUASAR_SSR_PWA__: 'readonly',
+        process: 'readonly',
+        Capacitor: 'readonly',
+        chrome: 'readonly'
+    },
+
+    // add your custom rules here
+    rules: {
+        // allow async-await
+        'generator-star-spacing': 'off',
+        // allow paren-less arrow functions
+        'arrow-parens': 'off',
+        'one-var': 'off',
+        'no-void': 'off',
+        'multiline-ternary': 'off',
+        'quote-props': 'off',
+
+        'import/first': 'off',
+        'import/namespace': 'error',
+        'import/default': 'error',
+        'import/export': 'error',
+        'import/extensions': 'off',
+        'import/no-unresolved': 'off',
+        'import/no-extraneous-dependencies': 'off',
+        'prefer-promise-reject-errors': 'off',
+        'indent': ["error", 4],
+        'semi': ["error", "always"],
+
+        // TypeScript
+        quotes: ['warn', 'double', { avoidEscape: true }],
+        '@typescript-eslint/explicit-function-return-type': 'off',
+        '@typescript-eslint/explicit-module-boundary-types': 'off',
+
+        // TypeScript -> Remove these when we start using TypeScript in the project.
+        '@typescript-eslint/no-unsafe-assignment': 'off',
+        '@typescript-eslint/no-unsafe-call': 'off',
+        '@typescript-eslint/unbound-method': 'off',
+        '@typescript-eslint/no-unsafe-member-access': 'off',
+        '@typescript-eslint/no-floating-promises': 'off',
+        '@typescript-eslint/restrict-template-expressions': 'off',
+        '@typescript-eslint/no-var-requires': 'off',
+        '@typescript-eslint/no-unsafe-return': 'off',
+
+        // allow debugger during development only
+        'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
+    }
+}
--- a/domain-server/resources/web/web-new/.gitignore
+++ b/domain-server/resources/web/web-new/.gitignore
@ -0,0 +1,33 @@
+.DS_Store
+.thumbs.db
+node_modules
+
+# Quasar core related directories
+.quasar
+# /dist
+
+# Cordova related directories and files
+/src-cordova/node_modules
+/src-cordova/platforms
+/src-cordova/plugins
+/src-cordova/www
+
+# Capacitor related directories and files
+/src-capacitor/www
+/src-capacitor/node_modules
+
+# BEX related directories and files
+/src-bex/www
+/src-bex/js/core
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Editor directories and files
+.idea
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
--- a/domain-server/resources/web/web-new/.postcssrc.js
+++ b/domain-server/resources/web/web-new/.postcssrc.js
@ -0,0 +1,8 @@
+// https://github.com/michael-ciniawsky/postcss-load-config
+
+module.exports = {
+  plugins: [
+    // to edit target browsers: use "browserslist" field in package.json
+    require('autoprefixer')
+  ]
+}
--- a/domain-server/resources/web/web-new/.vscode/extensions.json
+++ b/domain-server/resources/web/web-new/.vscode/extensions.json
@ -0,0 +1,12 @@
+{
+  "recommendations": [
+    "dbaeumer.vscode-eslint",
+    
+    "octref.vetur"
+  ],
+  "unwantedRecommendations": [
+    "hookyqr.beautify",
+    "dbaeumer.jshint",
+    "ms-vscode.vscode-typescript-tslint-plugin"
+  ]
+}
--- a/domain-server/resources/web/web-new/.vscode/settings.json
+++ b/domain-server/resources/web/web-new/.vscode/settings.json
@ -0,0 +1,7 @@
+{
+  "vetur.validation.template": false,
+  "vetur.format.enable": false,
+  "eslint.validate": ["javascript", "javascriptreact", "typescript", "vue"],
+  "typescript.tsdk": "node_modules/typescript/lib",
+  "vetur.experimental.templateInterpolationService": true
+}
--- a/domain-server/resources/web/web-new/README.md
+++ b/domain-server/resources/web/web-new/README.md
@ -0,0 +1,33 @@
+# Vircadia Domain Dashboard (vircadia-domain-dashboard)
+
+The Domain dashboard for Vircadia virtual worlds.
+
+## Maintainer Instructions
+
+If you have made changes to the dashboard, you must build it and commit those built files. It is also necessary to build it if you wish to have your changes reflected in a packaged Domain server.
+
+## Install the Dependencies
+```bash
+npm install
+```
+
+### Start the Dashboard in Development Mode (hot-code reloading, error reporting, etc.)
+```bash
+quasar dev
+```
+
+### Lint the Files
+```bash
+npm run lint
+```
+
+## Build the Dashboard
+
+This automatically places the compiled dashboard into the right directory (`/dist/spa`) to be used by the Domain server after it is packaged.
+
+```bash
+quasar build
+```
+
+### Customize the configuration
+See [Configuring quasar.conf.js](https://v2.quasar.dev/quasar-cli/quasar-conf-js).
--- a/domain-server/resources/web/web-new/babel.config.js
+++ b/domain-server/resources/web/web-new/babel.config.js
@ -0,0 +1,15 @@
+/* eslint-env node */
+
+module.exports = api => {
+  return {
+    presets: [
+      [
+        '@quasar/babel-preset-app',
+        api.caller(caller => caller && caller.target === 'node')
+          ? { targets: { node: 'current' } }
+          : {}
+      ]
+    ]
+  }
+}
+
--- a/domain-server/resources/web/web-new/dist/spa/css/885.684a1d9d.css
+++ b/domain-server/resources/web/web-new/dist/spa/css/885.684a1d9d.css
@ -0,0 +1 @@
+#firstTimeWizardContainer[data-v-01471642]{animation:firstTimeWizardContainerFadeIn-01471642 5s;-webkit-animation:firstTimeWizardContainerFadeIn-01471642 5s;-moz-animation:firstTimeWizardContainerFadeIn-01471642 5s;-o-animation:firstTimeWizardContainerFadeIn-01471642 5s;-ms-animation:firstTimeWizardContainerFadeIn-01471642 5s;background-color:#000000bf}@keyframes firstTimeWizardContainerFadeIn-01471642{0%{background-color:#0000}to{background-color:#000000bf}}.welcome[data-v-01471642]{color:#fff}.wizardCard[data-v-01471642]{color:#fff}.mainWizardStepper[data-v-01471642],.wizardCard[data-v-01471642]{background:none!important;box-shadow:none!important}[data-v-01471642] .q-stepper__header{display:none!important}[data-v-01471642] .q-panel{overflow:hidden!important}.q-dialog__inner div[data-v-01471642]{border:none!important;box-shadow:none!important}
--- a/domain-server/resources/web/web-new/dist/spa/css/app.31d6cfe0.css
+++ b/domain-server/resources/web/web-new/dist/spa/css/app.31d6cfe0.css
--- a/domain-server/resources/web/web-new/dist/spa/css/vendor.2ba81df8.css
+++ b/domain-server/resources/web/web-new/dist/spa/css/vendor.2ba81df8.css
--- a/domain-server/resources/web/web-new/dist/spa/favicon.ico
+++ b/domain-server/resources/web/web-new/dist/spa/favicon.ico
--- a/domain-server/resources/web/web-new/dist/spa/fonts/KFOkCnqEu92Fr1MmgVxIIzQ.9391e6e2.woff
+++ b/domain-server/resources/web/web-new/dist/spa/fonts/KFOkCnqEu92Fr1MmgVxIIzQ.9391e6e2.woff
--- a/domain-server/resources/web/web-new/dist/spa/fonts/KFOlCnqEu92Fr1MmEU9fBBc-.ddd11dab.woff
+++ b/domain-server/resources/web/web-new/dist/spa/fonts/KFOlCnqEu92Fr1MmEU9fBBc-.ddd11dab.woff
--- a/domain-server/resources/web/web-new/dist/spa/fonts/KFOlCnqEu92Fr1MmSU5fBBc-.877b9231.woff
+++ b/domain-server/resources/web/web-new/dist/spa/fonts/KFOlCnqEu92Fr1MmSU5fBBc-.877b9231.woff
--- a/domain-server/resources/web/web-new/dist/spa/fonts/KFOlCnqEu92Fr1MmWUlfBBc-.0344cc3c.woff
+++ b/domain-server/resources/web/web-new/dist/spa/fonts/KFOlCnqEu92Fr1MmWUlfBBc-.0344cc3c.woff
--- a/domain-server/resources/web/web-new/dist/spa/fonts/KFOlCnqEu92Fr1MmYUtfBBc-.b555d228.woff
+++ b/domain-server/resources/web/web-new/dist/spa/fonts/KFOlCnqEu92Fr1MmYUtfBBc-.b555d228.woff
--- a/domain-server/resources/web/web-new/dist/spa/fonts/KFOmCnqEu92Fr1Mu4mxM.9b78ea3b.woff
+++ b/domain-server/resources/web/web-new/dist/spa/fonts/KFOmCnqEu92Fr1Mu4mxM.9b78ea3b.woff
--- a/domain-server/resources/web/web-new/dist/spa/fonts/flUhRq6tzZclQEJ-Vdg-IuiaDsNa.53e02ee0.woff
+++ b/domain-server/resources/web/web-new/dist/spa/fonts/flUhRq6tzZclQEJ-Vdg-IuiaDsNa.53e02ee0.woff
--- a/domain-server/resources/web/web-new/dist/spa/fonts/flUhRq6tzZclQEJ-Vdg-IuiaDsNcIhQ8tQ.6a798765.woff2
+++ b/domain-server/resources/web/web-new/dist/spa/fonts/flUhRq6tzZclQEJ-Vdg-IuiaDsNcIhQ8tQ.6a798765.woff2
--- a/domain-server/resources/web/web-new/dist/spa/icons/favicon-128x128.png
+++ b/domain-server/resources/web/web-new/dist/spa/icons/favicon-128x128.png
--- a/domain-server/resources/web/web-new/dist/spa/icons/favicon-16x16.png
+++ b/domain-server/resources/web/web-new/dist/spa/icons/favicon-16x16.png
--- a/domain-server/resources/web/web-new/dist/spa/icons/favicon-32x32.png
+++ b/domain-server/resources/web/web-new/dist/spa/icons/favicon-32x32.png
--- a/domain-server/resources/web/web-new/dist/spa/icons/favicon-96x96.png
+++ b/domain-server/resources/web/web-new/dist/spa/icons/favicon-96x96.png
--- a/domain-server/resources/web/web-new/dist/spa/index.html
+++ b/domain-server/resources/web/web-new/dist/spa/index.html
@ -0,0 +1 @@
+<!DOCTYPE html><html><head><title>Vircadia Domain Dashboard</title><meta charset=utf-8><meta name=description content="The Domain dashboard for Vircadia virtual worlds."><meta name=format-detection content="telephone=no"><meta name=msapplication-tap-highlight content=no><meta name=viewport content="user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1,width=device-width"><link rel=icon type=image/png sizes=128x128 href=icons/favicon-128x128.png><link rel=icon type=image/png sizes=96x96 href=icons/favicon-96x96.png><link rel=icon type=image/png sizes=32x32 href=icons/favicon-32x32.png><link rel=icon type=image/png sizes=16x16 href=icons/favicon-16x16.png><link rel=icon type=image/ico href=favicon.ico><script defer src=js/vendor.f7426f3d.js></script><script defer src=js/app.d7a0143e.js></script><link href=css/vendor.2ba81df8.css rel=stylesheet><link href=css/app.31d6cfe0.css rel=stylesheet></head><body><div id=q-app></div></body></html>
--- a/domain-server/resources/web/web-new/dist/spa/js/197.1d65bbb2.js
+++ b/domain-server/resources/web/web-new/dist/spa/js/197.1d65bbb2.js
@ -0,0 +1 @@
+"use strict";(self["webpackChunkvircadia_domain_dashboard"]=self["webpackChunkvircadia_domain_dashboard"]||[]).push([[197],{7197:(t,a,n)=>{n.r(a),n.d(a,{default:()=>m});var e=n(3673);const i={id:"firstTimeWizardContainer"};function s(t,a,n,s,o,r){const u=(0,e.up)("router-view"),h=(0,e.up)("q-page-container"),d=(0,e.up)("q-layout");return(0,e.wg)(),(0,e.j4)(d,{id:"vantaBG",view:"hHh lpR fFf"},{default:(0,e.w5)((()=>[(0,e.Wm)(h,null,{default:(0,e.w5)((()=>[(0,e._)("div",i,[(0,e.Wm)(u)])])),_:1})])),_:1})}n(71);var o=n(3991);const r=(0,e.aZ)({name:"FirstTimeWizard",data(){return{vantaBG:null,vantaRings:null,refreshVantaTimeout:null,DELAY_REFRESH_VANTA:500}},async mounted(){window.THREE=o,this.vantaRings=(await n.e(736).then(n.t.bind(n,5160,23))).default,this.initVanta(),visualViewport.addEventListener("resize",this.onResize)},methods:{onResize(){this.refreshVantaTimeout&&clearTimeout(this.refreshVantaTimeout),this.refreshVantaTimeout=setTimeout((()=>{this.initVanta(),this.refreshVantaTimeout=null}),this.DELAY_REFRESH_VANTA)},initVanta(){this.vantaBG&&this.vantaBG.destroy(),this.vantaBG=this.vantaRings({el:"#vantaBG",mouseControls:!1,touchControls:!1,gyroControls:!1,minHeight:200,minWidth:200,scale:1,scaleMobile:1,color:0})}},beforeUnmount(){this.vantaBG&&this.vantaBG.destroy()}});var u=n(4899),h=n(2652),d=n(7518),l=n.n(d);r.render=s;const m=r;l()(r,"components",{QLayout:u.Z,QPageContainer:h.Z})}}]);
--- a/domain-server/resources/web/web-new/dist/spa/js/264.e2c73bef.js
+++ b/domain-server/resources/web/web-new/dist/spa/js/264.e2c73bef.js
@ -0,0 +1 @@
+"use strict";(self["webpackChunkvircadia_domain_dashboard"]=self["webpackChunkvircadia_domain_dashboard"]||[]).push([[264],{9264:(a,n,d)=>{d.r(n),d.d(n,{default:()=>i});var e=d(3673);function r(a,n,d,r,s,i){return(0,e.wg)(),(0,e.iD)("h1",null,"Test")}const s=(0,e.aZ)({name:"Index"});s.render=r;const i=s}}]);
--- a/domain-server/resources/web/web-new/dist/spa/js/870.0b04c7bb.js
+++ b/domain-server/resources/web/web-new/dist/spa/js/870.0b04c7bb.js
@ -0,0 +1 @@
+"use strict";(self["webpackChunkvircadia_domain_dashboard"]=self["webpackChunkvircadia_domain_dashboard"]||[]).push([[870],{6870:(e,t,n)=>{n.r(t),n.d(t,{default:()=>h});var a=n(3673);const o={class:"fullscreen bg-blue text-white text-center q-pa-md flex flex-center"},s=(0,a._)("div",{style:{"font-size":"30vh"}}," 404 ",-1),l=(0,a._)("div",{class:"text-h2",style:{opacity:".4"}}," Oops. Nothing here... ",-1);function c(e,t,n,c,r,i){const d=(0,a.up)("q-btn");return(0,a.wg)(),(0,a.iD)("div",o,[(0,a._)("div",null,[s,l,(0,a.Wm)(d,{class:"q-mt-xl",color:"white","text-color":"blue",unelevated:"",to:"/",label:"Go Home","no-caps":""})])])}const r=(0,a.aZ)({name:"Error404"});var i=n(8240),d=n(7518),u=n.n(d);r.render=c;const h=r;u()(r,"components",{QBtn:i.Z})}}]);
--- a/domain-server/resources/web/web-new/dist/spa/js/885.c283608c.js
+++ b/domain-server/resources/web/web-new/dist/spa/js/885.c283608c.js
--- a/domain-server/resources/web/web-new/dist/spa/js/app.d7a0143e.js
+++ b/domain-server/resources/web/web-new/dist/spa/js/app.d7a0143e.js
--- a/domain-server/resources/web/web-new/dist/spa/js/vendor.f7426f3d.js
+++ b/domain-server/resources/web/web-new/dist/spa/js/vendor.f7426f3d.js
--- a/domain-server/resources/web/web-new/package-lock.json
+++ b/domain-server/resources/web/web-new/package-lock.json
--- a/domain-server/resources/web/web-new/package.json
+++ b/domain-server/resources/web/web-new/package.json
@ -0,0 +1,52 @@
+{
+    "name": "vircadia-domain-dashboard",
+    "version": "0.0.1",
+    "description": "The Domain dashboard for Vircadia virtual worlds.",
+    "productName": "Vircadia Domain Dashboard",
+    "author": "Kalila L. <somnilibertas@gmail.com>",
+    "private": true,
+    "scripts": {
+        "lint": "eslint --ext .js,.ts,.vue ./",
+        "lint-fix": "eslint --ext .js,.ts,.vue ./ --fix",
+        "test": "echo \"No test specified\" && exit 0"
+    },
+    "dependencies": {
+        "@quasar/extras": "^1.0.0",
+        "axios": "^0.21.1",
+        "core-js": "^3.6.5",
+        "js-sha256": "^0.9.0",
+        "quasar": "^2.0.0",
+        "three": "^0.132.2",
+        "vanta": "^0.5.21",
+        "vuex": "^4.0.1"
+    },
+    "devDependencies": {
+        "@babel/eslint-parser": "^7.13.14",
+        "@quasar/app": "^3.0.0",
+        "@types/node": "^12.20.21",
+        "@typescript-eslint/eslint-plugin": "^4.16.1",
+        "@typescript-eslint/parser": "^4.16.1",
+        "eslint": "^7.14.0",
+        "eslint-config-standard": "^16.0.2",
+        "eslint-plugin-import": "^2.19.1",
+        "eslint-plugin-node": "^11.0.0",
+        "eslint-plugin-promise": "^5.1.0",
+        "eslint-plugin-vue": "^7.0.0"
+    },
+    "browserslist": [
+        "last 10 Chrome versions",
+        "last 10 Firefox versions",
+        "last 4 Edge versions",
+        "last 7 Safari versions",
+        "last 8 Android versions",
+        "last 8 ChromeAndroid versions",
+        "last 8 FirefoxAndroid versions",
+        "last 10 iOS versions",
+        "last 5 Opera versions"
+    ],
+    "engines": {
+        "node": ">= 12.22.1",
+        "npm": ">= 6.13.4",
+        "yarn": ">= 1.21.1"
+    }
+}
--- a/domain-server/resources/web/web-new/public/favicon.ico
+++ b/domain-server/resources/web/web-new/public/favicon.ico
--- a/domain-server/resources/web/web-new/public/icons/favicon-128x128.png
+++ b/domain-server/resources/web/web-new/public/icons/favicon-128x128.png
--- a/domain-server/resources/web/web-new/public/icons/favicon-16x16.png
+++ b/domain-server/resources/web/web-new/public/icons/favicon-16x16.png
--- a/domain-server/resources/web/web-new/public/icons/favicon-32x32.png
+++ b/domain-server/resources/web/web-new/public/icons/favicon-32x32.png
--- a/domain-server/resources/web/web-new/public/icons/favicon-96x96.png
+++ b/domain-server/resources/web/web-new/public/icons/favicon-96x96.png
--- a/domain-server/resources/web/web-new/quasar.conf.js
+++ b/domain-server/resources/web/web-new/quasar.conf.js
@ -0,0 +1,233 @@
+/*
+ * This file runs in a Node context (it's NOT transpiled by Babel), so use only
+ * the ES6 features that are supported by your Node version. https://node.green/
+ */
+
+// Configuration for your app
+// https://v2.quasar.dev/quasar-cli/quasar-conf-js
+
+/* eslint-env node */
+/* eslint-disable @typescript-eslint/no-var-requires */
+const { configure } = require("quasar/wrappers");
+
+module.exports = configure(function (ctx) {
+    return {
+    // https://v2.quasar.dev/quasar-cli/supporting-ts
+        supportTS: {
+            tsCheckerConfig: {
+                eslint: {
+                    enabled: true,
+                    files: "./src/**/*.{ts,tsx,js,jsx,vue}"
+                }
+            }
+        },
+
+        // https://v2.quasar.dev/quasar-cli/prefetch-feature
+        // preFetch: true,
+
+        // app boot file (/src/boot)
+        // --> boot files are part of "main.js"
+        // https://v2.quasar.dev/quasar-cli/boot-files
+        boot: [
+            "axios"
+        ],
+
+        // https://v2.quasar.dev/quasar-cli/quasar-conf-js#Property%3A-css
+        css: [
+            "app.scss"
+        ],
+
+        // https://github.com/quasarframework/quasar/tree/dev/extras
+        extras: [
+            // 'ionicons-v4',
+            // 'mdi-v5',
+            // 'fontawesome-v5',
+            // 'eva-icons',
+            // 'themify',
+            // 'line-awesome',
+            // 'roboto-font-latin-ext', // this or either 'roboto-font', NEVER both!
+
+            "roboto-font", // optional, you are not bound to it
+            "material-icons" // optional, you are not bound to it
+        ],
+
+        // Full list of options: https://v2.quasar.dev/quasar-cli/quasar-conf-js#Property%3A-build
+        build: {
+            vueRouterMode: "hash", // available values: 'hash', 'history'
+
+            // transpile: false,
+
+            // Add dependencies for transpiling with Babel (Array of string/regex)
+            // (from node_modules, which are by default not transpiled).
+            // Applies only if "transpile" is set to true.
+            // transpileDependencies: [],
+
+            // rtl: true, // https://v2.quasar.dev/options/rtl-support
+            // preloadChunks: true,
+            // showProgress: false,
+            // gzip: true,
+            // analyze: true,
+
+            // Options below are automatically set depending on the env, set them if you want to override
+            // extractCSS: false,
+
+            // https://v2.quasar.dev/quasar-cli/handling-webpack
+            // "chain" is a webpack-chain object https://github.com/neutrinojs/webpack-chain
+            chainWebpack (/* chain */) {
+                //
+            }
+        },
+
+        // Full list of options: https://v2.quasar.dev/quasar-cli/quasar-conf-js#Property%3A-devServer
+        devServer: {
+            https: false,
+            port: 8080,
+            open: true // opens browser window automatically
+        },
+
+        // https://v2.quasar.dev/quasar-cli/quasar-conf-js#Property%3A-framework
+        framework: {
+            config: {
+                dark: "auto"
+            },
+
+            // iconSet: 'material-icons', // Quasar icon set
+            // lang: 'en-US', // Quasar language pack
+
+            // For special cases outside of where the auto-import strategy can have an impact
+            // (like functional components as one of the examples),
+            // you can manually specify Quasar components/directives to be available everywhere:
+            //
+            // components: [],
+            // directives: [],
+
+            // Quasar plugins
+            plugins: [
+                "Notify",
+                "Loading"
+            ]
+        },
+
+        // animations: 'all', // --- includes all animations
+        // https://v2.quasar.dev/options/animations
+        animations: "all",
+
+        // https://v2.quasar.dev/quasar-cli/developing-ssr/configuring-ssr
+        ssr: {
+            pwa: false,
+
+            // manualStoreHydration: true,
+            // manualPostHydrationTrigger: true,
+
+            prodPort: 3000, // The default port that the production server should use
+            // (gets superseded if process.env.PORT is specified at runtime)
+
+            maxAge: 1000 * 60 * 60 * 24 * 30,
+            // Tell browser when a file from the server should expire from cache (in ms)
+
+            chainWebpackWebserver (/* chain */) {
+                //
+            },
+
+            middlewares: [
+                ctx.prod ? "compression" : "",
+                "render" // keep this as last one
+            ]
+        },
+
+        // https://v2.quasar.dev/quasar-cli/developing-pwa/configuring-pwa
+        pwa: {
+            workboxPluginMode: "GenerateSW", // 'GenerateSW' or 'InjectManifest'
+            workboxOptions: {}, // only for GenerateSW
+
+            // for the custom service worker ONLY (/src-pwa/custom-service-worker.[js|ts])
+            // if using workbox in InjectManifest mode
+            chainWebpackCustomSW (/* chain */) {
+                //
+            },
+
+            manifest: {
+                name: "Vircadia Domain Dashboard",
+                short_name: "Vircadia Domain Dashboard",
+                description: "The Domain dashboard for Vircadia virtual worlds.",
+                display: "standalone",
+                orientation: "portrait",
+                background_color: "#ffffff",
+                theme_color: "#027be3",
+                icons: [
+                    {
+                        src: "icons/icon-128x128.png",
+                        sizes: "128x128",
+                        type: "image/png"
+                    },
+                    {
+                        src: "icons/icon-192x192.png",
+                        sizes: "192x192",
+                        type: "image/png"
+                    },
+                    {
+                        src: "icons/icon-256x256.png",
+                        sizes: "256x256",
+                        type: "image/png"
+                    },
+                    {
+                        src: "icons/icon-384x384.png",
+                        sizes: "384x384",
+                        type: "image/png"
+                    },
+                    {
+                        src: "icons/icon-512x512.png",
+                        sizes: "512x512",
+                        type: "image/png"
+                    }
+                ]
+            }
+        },
+
+        // Full list of options: https://v2.quasar.dev/quasar-cli/developing-cordova-apps/configuring-cordova
+        cordova: {
+            // noIosLegacyBuildFlag: true, // uncomment only if you know what you are doing
+        },
+
+        // Full list of options: https://v2.quasar.dev/quasar-cli/developing-capacitor-apps/configuring-capacitor
+        capacitor: {
+            hideSplashscreen: true
+        },
+
+        // Full list of options: https://v2.quasar.dev/quasar-cli/developing-electron-apps/configuring-electron
+        electron: {
+            bundler: "packager", // 'packager' or 'builder'
+
+            packager: {
+                // https://github.com/electron-userland/electron-packager/blob/master/docs/api.md#options
+
+                // OS X / Mac App Store
+                // appBundleId: '',
+                // appCategoryType: '',
+                // osxSign: '',
+                // protocol: 'myapp://path',
+
+                // Windows only
+                // win32metadata: { ... }
+            },
+
+            builder: {
+                // https://www.electron.build/configuration/configuration
+
+                appId: "vircadia-domain-dashboard"
+            },
+
+            // "chain" is a webpack-chain object https://github.com/neutrinojs/webpack-chain
+            chainWebpack (/* chain */) {
+                // do something with the Electron main process Webpack cfg
+                // extendWebpackMain also available besides this chainWebpackMain
+            },
+
+            // "chain" is a webpack-chain object https://github.com/neutrinojs/webpack-chain
+            chainWebpackPreload (/* chain */) {
+                // do something with the Electron main process Webpack cfg
+                // extendWebpackPreload also available besides this chainWebpackPreload
+            }
+        }
+    };
+});
--- a/domain-server/resources/web/web-new/src/App.vue
+++ b/domain-server/resources/web/web-new/src/App.vue
@ -0,0 +1,20 @@
+<!--
+//  App.vue
+//
+//  Created by Kalila L. on Sep. 4th, 2021.
+//  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
+-->
+
+<template>
+    <router-view />
+</template>
+<script lang="ts">
+import { defineComponent } from "vue";
+
+export default defineComponent({
+    name: "App"
+});
+</script>
--- a/domain-server/resources/web/web-new/src/assets/hq1.jpg
+++ b/domain-server/resources/web/web-new/src/assets/hq1.jpg
--- a/domain-server/resources/web/web-new/src/assets/hub_world.zip
+++ b/domain-server/resources/web/web-new/src/assets/hub_world.zip
--- a/domain-server/resources/web/web-new/src/assets/vircadia-icon-1024.png
+++ b/domain-server/resources/web/web-new/src/assets/vircadia-icon-1024.png
--- a/domain-server/resources/web/web-new/src/boot/.gitkeep
+++ b/domain-server/resources/web/web-new/src/boot/.gitkeep
--- a/domain-server/resources/web/web-new/src/boot/axios.ts
+++ b/domain-server/resources/web/web-new/src/boot/axios.ts
@ -0,0 +1,56 @@
+//  axios.ts
+//
+//  Created by Kalila L. on Sep. 4th, 2021.
+//  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
+
+import { boot } from "quasar/wrappers";
+import axios, { AxiosInstance } from "axios";
+import Log from "../modules/utilities/log";
+
+declare module "@vue/runtime-core" {
+    interface ComponentCustomProperties {
+        $axios: AxiosInstance;
+    }
+}
+
+Log.info(Log.types.OTHER, "Bootstrapping Axios.");
+
+// TODO: This needs to be centralized and not hardcoded.
+const METAVERSE_URL = "https://metaverse.vircadia.com/live";
+axios.interceptors.request.use((config) => {
+    // This is a necessary header to be passed to the Metaverse server in order for
+    // it to fail with an HTTP error code instead of succeeding and returning
+    // the error in JSON only.
+    if (config.url?.includes(METAVERSE_URL)) {
+        config.headers["x-vircadia-error-handle"] = "badrequest";
+    }
+    console.info("config", config);
+    return config;
+}, (error) => {
+    return Promise.reject(error);
+});
+
+// Be careful when using SSR for cross-request state pollution
+// due to creating a Singleton instance here;
+// If any client changes this (global) instance, it might be a
+// good idea to move this instance creation inside of the
+// "export default () => {}" function below (which runs individually
+// for each client)
+const api = axios.create({ baseURL: "https://api.example.com" });
+
+export default boot(({ app }) => {
+    // for use inside Vue files (Options API) through this.$axios and this.$api
+
+    app.config.globalProperties.$axios = axios;
+    // ^ ^ ^ this will allow you to use this.$axios (for Vue Options API form)
+    //       so you won't necessarily have to import axios in each vue file
+
+    app.config.globalProperties.$api = api;
+    // ^ ^ ^ this will allow you to use this.$api (for Vue Options API form)
+    //       so you can easily perform requests against your app's API
+});
+
+export { api };
--- a/domain-server/resources/web/web-new/src/components/components/login/MetaverseLogin.vue
+++ b/domain-server/resources/web/web-new/src/components/components/login/MetaverseLogin.vue
@ -0,0 +1,128 @@
+<!--
+//  MetaverseLogin.vue
+//
+//  Created by Kalila L. on May 18th, 2021.
+//  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
+-->
+
+<template>
+    <q-form
+        @submit="onSubmit"
+        @reset="onReset"
+        class="q-gutter-md"
+        :autocomplete="AUTOCOMPLETE"
+    >
+        <q-input
+            v-model="username"
+            filled
+            dark
+            label="Username"
+            hint="Enter your username."
+            lazy-rules
+            :rules="[ val => val && val.length > 0 || 'Please enter a username.']"
+        />
+
+        <q-input
+            v-model="password"
+            filled
+            dark
+            label="Password"
+            :type="showPassword ? 'text' : 'password'"
+            hint="Enter your password."
+            lazy-rules
+            :rules="[ val => val && val.length > 0 || 'Please enter a password.']"
+        >
+            <template v-slot:append>
+                <q-icon
+                    :name="showPassword ? 'visibility' : 'visibility_off'"
+                    class="cursor-pointer"
+                    @click="showPassword = !showPassword"
+                />
+            </template>
+        </q-input>
+
+        <div align="right">
+            <q-btn label="Reset" type="reset" color="primary" flat class="q-mr-sm" />
+            <q-btn label="Login" type="submit" color="primary"/>
+        </div>
+    </q-form>
+</template>
+
+<script>
+// FIXME: Needs to be done correctly. Also universally? Maybe window.axios?
+const axios = require("axios");
+
+import Log from "../../../modules/utilities/log";
+
+export default {
+    name: "MetaverseLogin",
+
+    emits: ["loginResult"],
+
+    data: () => ({
+        username: "",
+        password: "",
+        showPassword: false,
+        // TODO: Needs to be stored somewhere central.
+        DEFAULT_METAVERSE_URL: "https://metaverse.vircadia.com/live",
+        AUTOCOMPLETE: false
+    }),
+
+    methods: {
+        async onSubmit () {
+            const metaverseUrl = await this.retrieveMetaverseUrl();
+            const result = await this.attemptLogin(metaverseUrl, this.username, this.password);
+
+            this.$emit("loginResult", { "success": result.success, "metaverse": metaverseUrl, "data": result.response });
+        },
+
+        // TODO: This needs to be addressed in a more modular fashion to reuse and save state across multiple components.
+        async retrieveMetaverseUrl () {
+            return new Promise((resolve) => {
+                axios.get("/api/metaverse_info")
+                    .then((response) => {
+                        Log.info(Log.types.METAVERSE, `Retrieved Metaverse URL ${response.data.metaverse_url}.`);
+                        resolve(response.data.metaverse_url);
+                    }, (error) => {
+                        Log.error(Log.types.METAVERSE, `Failed to retrieve Metaverse URL, using default URL ${this.DEFAULT_METAVERSE_URL} instead. Error: ${error}`);
+                        resolve(this.DEFAULT_METAVERSE_URL);
+                    });
+            });
+        },
+
+        async attemptLogin (metaverse, username, password) {
+            Log.info(Log.types.METAVERSE, `Attempting to login as ${username}.`);
+
+            return new Promise((resolve) => {
+                axios.post(`${metaverse}/oauth/token`, {
+                    grant_type: "password",
+                    scope: "owner", // as opposed to 'domain', we're asking for a user token
+                    username: username,
+                    password: password
+                })
+                    .then((response) => {
+                        Log.info(Log.types.METAVERSE, `Successfully got key and details for ${username}.`);
+                        resolve({ "success": true, "response": response.data });
+                    }, (error) => {
+                        Log.error(Log.types.METAVERSE, `Failed to get key and details for ${username}.`);
+                        if (error.response && error.response.data) {
+                            resolve({ "success": false, "response": error.response.data });
+                        } else if (error) {
+                            resolve({ "success": false, "response": error });
+                        } else {
+                            resolve({ "success": false, "response": "Unknown reason." });
+                        }
+                    });
+            });
+        },
+
+        onReset () {
+            this.username = "";
+            this.password = "";
+        }
+    }
+};
+</script>
--- a/domain-server/resources/web/web-new/src/components/dialogs/ConnectMetaverse.vue
+++ b/domain-server/resources/web/web-new/src/components/dialogs/ConnectMetaverse.vue
@ -0,0 +1,131 @@
+<!--
+//  ConnectMetaverse.vue
+//
+//  Created by Kalila L. on Sep. 5th, 2021.
+//  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
+-->
+
+<template>
+    <q-card-section>
+        <div class="row no-wrap items-center">
+            <div class="col text-h4 ellipsis">
+                Metaverse
+            </div>
+        </div>
+
+    </q-card-section>
+
+    <q-separator />
+
+    <q-card-section>
+        <MetaverseLogin @loginResult="onLoginAttempt"></MetaverseLogin>
+    </q-card-section>
+</template>
+
+<script>
+// FIXME: Needs to be done correctly. Also universally? Maybe window.axios?
+const axios = require("axios");
+
+// Components
+import MetaverseLogin from "../components/login/MetaverseLogin.vue";
+// Modules
+import Log from "../../modules/utilities/log";
+
+export default {
+    name: "ConnectMetaverse",
+
+    components: {
+        MetaverseLogin
+    },
+
+    emits: ["connectionResult"],
+
+    data: () => ({
+    }),
+
+    methods: {
+        onLoginAttempt (result) {
+            if (result.success === true) {
+                Log.info(Log.types.METAVERSE, `Successfully logged in as ${result.data.account_name} for Metaverse linking.`);
+                // Get a token for our server from the Metaverse.
+                axios.post(`${result.metaverse}/api/v1/token/new`, {}, {
+                    params: {
+                        // "asAdmin": store.account.useAsAdmin,
+                        "scope": "domain"
+                    },
+                    headers: {
+                        "Authorization": `Bearer ${result.data.access_token}`
+                    }
+                })
+                    .catch((result) => {
+                        Log.error(Log.types.METAVERSE, "Failed to link server with Metaverse.");
+
+                        this.$q.notify({
+                            type: "negative",
+                            textColor: "white",
+                            icon: "warning",
+                            message: `Metaverse link attempt failed. ${result}`
+                        });
+                    })
+                    .then(async (response) => {
+                        Log.info(Log.types.METAVERSE, "Successfully got Domain token for Metaverse linking.");
+
+                        const settingsToCommit = {
+                            "metaverse": {
+                                "access_token": response.data.data.token
+                            }
+                        };
+
+                        const committed = await this.commitSettings(settingsToCommit);
+
+                        if (committed === true) {
+                            Log.info(Log.types.METAVERSE, "Successfully committed Domain server access token for the Metaverse.");
+                            this.$q.notify({
+                                type: "positive",
+                                textColor: "white",
+                                icon: "cloud_done",
+                                message: "Successfully linked your server to the Metaverse."
+                            });
+
+                            this.$emit("connectionResult", { "success": true });
+                        } else {
+                            Log.error(Log.types.METAVERSE, "Failed to link server with Metaverse: Could not commit token to settings.");
+                            this.$q.notify({
+                                type: "negative",
+                                textColor: "white",
+                                icon: "warning",
+                                message: "Metaverse link attempt failed because the settings were unable to be saved."
+                            });
+
+                            this.$emit("connectionResult", { "success": false });
+                        }
+                    });
+            } else {
+                this.$q.notify({
+                    type: "negative",
+                    textColor: "white",
+                    icon: "warning",
+                    message: `Login attempt failed: ${result.data.error}`
+                });
+            }
+        },
+
+        // TODO: This needs to go somewhere universal.
+        commitSettings (settingsToCommit) {
+            // TODO: This and all other URL endpoints should be in centralized (in their respective module) constants files.
+            return axios.post("/settings.json", JSON.stringify(settingsToCommit))
+                .then(() => {
+                    Log.info(Log.types.DOMAIN, "Successfully committed settings.");
+                    return true;
+                })
+                .catch((response) => {
+                    Log.error(Log.types.DOMAIN, `Failed to commit settings to Domain: ${response}`);
+                    return false;
+                });
+        }
+    }
+};
+</script>
--- a/domain-server/resources/web/web-new/src/css/app.scss
+++ b/domain-server/resources/web/web-new/src/css/app.scss
@ -0,0 +1 @@
+// app global css in SCSS form
--- a/domain-server/resources/web/web-new/src/css/quasar.variables.scss
+++ b/domain-server/resources/web/web-new/src/css/quasar.variables.scss
@ -0,0 +1,24 @@
+// Quasar SCSS (& Sass) Variables
+// --------------------------------------------------
+// To customize the look and feel of this app, you can override
+// the Sass/SCSS variables found in Quasar's source Sass/SCSS files.
+
+// Check documentation for full list of Quasar variables
+
+// Your own variables (that are declared here) and Quasar's own
+// ones will be available out of the box in your .vue/.scss/.sass files
+
+// It's highly recommended to change the default colors
+// to match your app's branding.
+// Tip: Use the "Theme Builder" on Quasar's documentation website.
+
+$primary   : #1976D2;
+$secondary : #26A69A;
+$accent    : #9C27B0;
+
+$dark      : #1D1D1D;
+
+$positive  : #21BA45;
+$negative  : #C10015;
+$info      : #31CCEC;
+$warning   : #F2C037;
--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				#firstTimeWizardContainer[data-v-01471642]{animation:firstTimeWizardContainerFadeIn-01471642 5s;-webkit-animation:firstTimeWizardContainerFadeIn-01471642 5s;-moz-animation:firstTimeWizardContainerFadeIn-01471642 5s;-o-animation:firstTimeWizardContainerFadeIn-01471642 5s;-ms-animation:firstTimeWizardContainerFadeIn-01471642 5s;background-color:#000000bf}@keyframes firstTimeWizardContainerFadeIn-01471642{0%{background-color:#0000}to{background-color:#000000bf}}.welcome[data-v-01471642]{color:#fff}.wizardCard[data-v-01471642]{color:#fff}.mainWizardStepper[data-v-01471642],.wizardCard[data-v-01471642]{background:none!important;box-shadow:none!important}[data-v-01471642] .q-stepper__header{display:none!important}[data-v-01471642] .q-panel{overflow:hidden!important}.q-dialog__inner div[data-v-01471642]{border:none!important;box-shadow:none!important}
				`@ -0,0 +1 @@`
				<!DOCTYPE html><html><head><title>Vircadia Domain Dashboard</title><meta charset=utf-8><meta name=description content="The Domain dashboard for Vircadia virtual worlds."><meta name=format-detection content="telephone=no"><meta name=msapplication-tap-highlight content=no><meta name=viewport content="user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1,width=device-width"><link rel=icon type=image/png sizes=128x128 href=icons/favicon-128x128.png><link rel=icon type=image/png sizes=96x96 href=icons/favicon-96x96.png><link rel=icon type=image/png sizes=32x32 href=icons/favicon-32x32.png><link rel=icon type=image/png sizes=16x16 href=icons/favicon-16x16.png><link rel=icon type=image/ico href=favicon.ico><script defer src=js/vendor.f7426f3d.js></script><script defer src=js/app.d7a0143e.js></script><link href=css/vendor.2ba81df8.css rel=stylesheet><link href=css/app.31d6cfe0.css rel=stylesheet></head><body><div id=q-app></div></body></html>
				`@ -0,0 +1 @@`
				"use strict";(self["webpackChunkvircadia_domain_dashboard"]=self["webpackChunkvircadia_domain_dashboard"]\|\|[]).push([[197],{7197:(t,a,n)=>{n.r(a),n.d(a,{default:()=>m});var e=n(3673);const i={id:"firstTimeWizardContainer"};function s(t,a,n,s,o,r){const u=(0,e.up)("router-view"),h=(0,e.up)("q-page-container"),d=(0,e.up)("q-layout");return(0,e.wg)(),(0,e.j4)(d,{id:"vantaBG",view:"hHh lpR fFf"},{default:(0,e.w5)((()=>[(0,e.Wm)(h,null,{default:(0,e.w5)((()=>[(0,e._)("div",i,[(0,e.Wm)(u)])])),_:1})])),_:1})}n(71);var o=n(3991);const r=(0,e.aZ)({name:"FirstTimeWizard",data(){return{vantaBG:null,vantaRings:null,refreshVantaTimeout:null,DELAY_REFRESH_VANTA:500}},async mounted(){window.THREE=o,this.vantaRings=(await n.e(736).then(n.t.bind(n,5160,23))).default,this.initVanta(),visualViewport.addEventListener("resize",this.onResize)},methods:{onResize(){this.refreshVantaTimeout&&clearTimeout(this.refreshVantaTimeout),this.refreshVantaTimeout=setTimeout((()=>{this.initVanta(),this.refreshVantaTimeout=null}),this.DELAY_REFRESH_VANTA)},initVanta(){this.vantaBG&&this.vantaBG.destroy(),this.vantaBG=this.vantaRings({el:"#vantaBG",mouseControls:!1,touchControls:!1,gyroControls:!1,minHeight:200,minWidth:200,scale:1,scaleMobile:1,color:0})}},beforeUnmount(){this.vantaBG&&this.vantaBG.destroy()}});var u=n(4899),h=n(2652),d=n(7518),l=n.n(d);r.render=s;const m=r;l()(r,"components",{QLayout:u.Z,QPageContainer:h.Z})}}]);
				`@ -0,0 +1 @@`
				`"use strict";(self["webpackChunkvircadia_domain_dashboard"]=self["webpackChunkvircadia_domain_dashboard"]\|\|[]).push([[264],{9264:(a,n,d)=>{d.r(n),d.d(n,{default:()=>i});var e=d(3673);function r(a,n,d,r,s,i){return(0,e.wg)(),(0,e.iD)("h1",null,"Test")}const s=(0,e.aZ)({name:"Index"});s.render=r;const i=s}}]);`