diff --git a/autobuild.xml b/autobuild.xml
index 0e5a5a2a25..198fcb8177 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1734,18 +1734,6 @@
       </map>
       <key>mikktspace</key>
       <map>
-        <key>canonical_repo</key>
-        <string>https://bitbucket.org/lindenlab/3p-mikktspace</string>
-        <key>copyright</key>
-        <string>Copyright (C) 2011 by Morten S. Mikkelsen</string>
-        <key>description</key>
-        <string>Mikktspace Tangent Generator</string>
-        <key>license</key>
-        <string>Copyright (C) 2011 by Morten S. Mikkelsen</string>
-        <key>license_file</key>
-        <string>mikktspace.txt</string>
-        <key>name</key>
-        <string>mikktspace</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1785,8 +1773,20 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>Copyright (C) 2011 by Morten S. Mikkelsen</string>
+        <key>license_file</key>
+        <string>mikktspace.txt</string>
+        <key>copyright</key>
+        <string>Copyright (C) 2011 by Morten S. Mikkelsen</string>
         <key>version</key>
         <string>1</string>
+        <key>name</key>
+        <string>mikktspace</string>
+        <key>canonical_repo</key>
+        <string>https://bitbucket.org/lindenlab/3p-mikktspace</string>
+        <key>description</key>
+        <string>Mikktspace Tangent Generator</string>
       </map>
       <key>minizip-ng</key>
       <map>
@@ -2376,18 +2376,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
       </map>
       <key>tinygltf</key>
       <map>
-        <key>canonical_repo</key>
-        <string>https://bitbucket.org/lindenlab/3p-tinygltf</string>
-        <key>copyright</key>
-        <string>// Copyright (c) 2015 - Present Syoyo Fujita, Aurélien Chatelain and many contributors.</string>
-        <key>description</key>
-        <string>tinygltf import library</string>
-        <key>license</key>
-        <string>MIT</string>
-        <key>license_file</key>
-        <string>LICENSES/tinygltf_license.txt</string>
-        <key>name</key>
-        <string>tinygltf</string>
         <key>platforms</key>
         <map>
           <key>common</key>
@@ -2403,12 +2391,24 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>common</string>
           </map>
         </map>
+        <key>license</key>
+        <string>MIT</string>
+        <key>license_file</key>
+        <string>LICENSES/tinygltf_license.txt</string>
+        <key>copyright</key>
+        <string>// Copyright (c) 2015 - Present Syoyo Fujita, Aurélien Chatelain and many contributors.</string>
+        <key>version</key>
+        <string>v2.5.0</string>
+        <key>name</key>
+        <string>tinygltf</string>
+        <key>canonical_repo</key>
+        <string>https://bitbucket.org/lindenlab/3p-tinygltf</string>
+        <key>description</key>
+        <string>tinygltf import library</string>
         <key>source</key>
         <string>https://bitbucket.org/lindenlab/3p-tinygltf</string>
         <key>source_type</key>
         <string>git</string>
-        <key>version</key>
-        <string>v2.5.0</string>
       </map>
       <key>tracy</key>
       <map>
@@ -2448,7 +2448,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
         <key>copyright</key>
         <string>Copyright (c) 2017-2022, Bartosz Taudul (wolf@nereid.pl)</string>
         <key>version</key>
-        <string>v0.8.1.235e98f</string>
+        <string>v0.8.1.578241</string>
         <key>name</key>
         <string>tracy</string>
         <key>canonical_repo</key>
@@ -2459,8 +2459,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
         <string>https://bitbucket.org/lindenlab/3p-tracy</string>
         <key>source_type</key>
         <string>git</string>
-        <key>version</key>
-        <string>v0.8.1.578241</string>
       </map>
       <key>tut</key>
       <map>
@@ -2724,18 +2722,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
       </map>
       <key>vulkan_gltf</key>
       <map>
-        <key>canonical_repo</key>
-        <string>https://bitbucket.org/lindenlab/3p-vulkan-gltf-pbr</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2018 Sascha Willems</string>
-        <key>description</key>
-        <string>Vulkan GLTF Sample Implementation</string>
-        <key>license</key>
-        <string>Copyright (c) 2018 Sascha Willems</string>
-        <key>license_file</key>
-        <string>LICENSES/vulkan_gltf.txt</string>
-        <key>name</key>
-        <string>vulkan_gltf</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2775,8 +2761,20 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>Copyright (c) 2018 Sascha Willems</string>
+        <key>license_file</key>
+        <string>LICENSES/vulkan_gltf.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2018 Sascha Willems</string>
         <key>version</key>
         <string>1</string>
+        <key>name</key>
+        <string>vulkan_gltf</string>
+        <key>canonical_repo</key>
+        <string>https://bitbucket.org/lindenlab/3p-vulkan-gltf-pbr</string>
+        <key>description</key>
+        <string>Vulkan GLTF Sample Implementation</string>
       </map>
       <key>xxhash</key>
       <map>
@@ -2912,6 +2910,62 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
         <key>description</key>
         <string>zlib data compression library for the next generation systems</string>
       </map>
+      <key>webrtc-shim</key>
+      <map>
+        <key>platforms</key>
+        <map>
+          <key>darwin64</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>creds</key>
+              <string>github</string>
+              <key>hash</key>
+              <string>a23ffe29c49f8fabb8c5f2de9879bed9d7e0e0ca</string>
+              <key>hash_algorithm</key>
+              <string>sha1</string>
+              <key>url</key>
+              <string>https://api.github.com/repos/secondlife/3p-webrtc-shim/releases/assets/155507516</string>
+            </map>
+            <key>name</key>
+            <string>darwin64</string>
+          </map>
+          <key>windows64</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>creds</key>
+              <string>github</string>
+              <key>hash</key>
+              <string>b264c6ed008bd45c4687c5dc4d7532727c74624a</string>
+              <key>hash_algorithm</key>
+              <string>sha1</string>
+              <key>url</key>
+              <string>https://api.github.com/repos/secondlife/3p-webrtc-shim/releases/assets/155507520</string>
+            </map>
+            <key>name</key>
+            <string>windows64</string>
+          </map>
+        </map>
+        <key>license</key>
+        <string>MIT</string>
+        <key>license_file</key>
+        <string>LICENSES/webrtc-license.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2011, The WebRTC project authors. All rights reserved.</string>
+        <key>version</key>
+        <string>m114.0.26.d4b8b92</string>
+        <key>name</key>
+        <string>webrtc-shim</string>
+        <key>vcs_branch</key>
+        <string>main</string>
+        <key>vcs_revision</key>
+        <string>d4b8b921825ae4344d87fdb0c9179c358c6e3698</string>
+        <key>vcs_url</key>
+        <string>https://github.com/secondlife/3p-webrtc-shim</string>
+        <key>canonical_repo</key>
+        <string>https://github.com/secondlife/3p-webrtc-shim</string>
+      </map>
     </map>
     <key>package_description</key>
     <map>
@@ -3369,4 +3423,4 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
       <string>Second Life Viewer</string>
     </map>
   </map>
-</llsd>
+</llsd>
\ No newline at end of file
diff --git a/indra/cmake/WebRTC.cmake b/indra/cmake/WebRTC.cmake
index 4032398c01..909a1345ed 100644
--- a/indra/cmake/WebRTC.cmake
+++ b/indra/cmake/WebRTC.cmake
@@ -1,46 +1,15 @@
 # -*- cmake -*-
+include(Linking)
+include(Prebuilt)
 
-include(FetchContent)
-
-if (WINDOWS)
-    if( ADDRESS_SIZE EQUAL 32 )
-        FetchContent_Declare(
-              webrtc
-              URL "https://webrtc-build-releases.s3.us-west-2.amazonaws.com/webrtc.windows_x86.tar.bz2"
-              URL_HASH "MD5=cefbd446b1b152ac08217fc78648fb99"
-              FIND_PACKAGE_ARGS NAMES webrtc
-              DOWNLOAD_EXTRACT_TIMESTAMP TRUE
-              DOWNLOAD_DIR "${LIBS_PREBUILT_DIR}/webrtc/"
-            )
-    else ( ADDRESS_SIZE EQUAL 32 )
-        FetchContent_Declare(
-              webrtc
-              URL "https://webrtc-build-releases.s3.us-west-2.amazonaws.com/webrtc.windows_x86_64.tar.bz2"
-              URL_HASH "MD5=6e25b99284215933ec1571b6e60c1030"
-              FIND_PACKAGE_ARGS NAMES webrtc
-              DOWNLOAD_EXTRACT_TIMESTAMP TRUE
-              DOWNLOAD_DIR "${LIBS_PREBUILT_DIR}/webrtc/"
-            )
-    endif ( ADDRESS_SIZE EQUAL 32 )
-elseif (DARWIN)
-    FetchContent_Declare(
-      webrtc
-      URL "https://webrtc-build-releases.s3.us-west-2.amazonaws.com/webrtc.macos_x86_64.tar.bz2"
-      URL_HASH "MD5=6849e81773135290f5c70cbf679992fb"
-      FIND_PACKAGE_ARGS NAMES webrtc
-      DOWNLOAD_EXTRACT_TIMESTAMP TRUE
-      DOWNLOAD_DIR "${LIBS_PREBUILT_DIR}/webrtc/"
-    )
-endif (WINDOWS)
-
-FetchContent_MakeAvailable(webrtc)
-
-set(WEBRTC_PATH ${webrtc_SOURCE_DIR})
+include_guard()
 
 add_library( ll::webrtc INTERFACE IMPORTED )
+target_include_directories( ll::webrtc SYSTEM INTERFACE "${LIBS_PREBUILT_DIR}/include/webrtc" "${LIBS_PREBUILT_DIR}/include/webrtc/third_party/abseil-cpp")
+use_prebuilt_binary(webrtc-shim)
 
 if (WINDOWS)
-    target_link_libraries( ll::webrtc INTERFACE "${WEBRTC_PATH}/lib/webrtc.lib" )
+    target_link_libraries( ll::webrtc INTERFACE webrtc.lib )
 elseif (DARWIN)
     FIND_LIBRARY(COREAUDIO_LIBRARY CoreAudio)
     FIND_LIBRARY(COREGRAPHICS_LIBRARY CoreGraphics)
@@ -49,7 +18,7 @@ elseif (DARWIN)
     FIND_LIBRARY(COCOA_LIBRARY Cocoa)
     
     target_link_libraries( ll::webrtc INTERFACE
-        "${WEBRTC_PATH}/lib/libwebrtc.a"
+        libwebrtc.a
         ${COREAUDIO_LIBRARY}
         ${AUDIOTOOLBOX_LIBRARY}
         ${COREGRAPHICS_LIBRARY}
@@ -57,10 +26,7 @@ elseif (DARWIN)
         ${COCOA_LIBRARY}
     )
 elseif (LINUX)
-    target_link_libraries( ll::webrtc INTERFACE "${WEBRTC_PATH}/lib/libwebrtc.a" )
+    target_link_libraries( ll::webrtc INTERFACE libwebrtc )
 endif (WINDOWS)
 
-message("PATH: ${WEBRTC_PATH}/include")
-    
-target_include_directories( ll::webrtc INTERFACE "${WEBRTC_PATH}/include" "${WEBRTC_PATH}/include/third_party/abseil-cpp")