Merge branch 'DRTVWR-489-emoji' into DRTVWR-489-emoji

2 files changed, 77 insertions, 69 deletions

diff --git a/autobuild.xml b/autobuild.xml
index aeea64fc12..45db43e91e 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -649,36 +649,6 @@
         <key>version</key>
         <string>2.02.06.570913</string>
       </map>
-      <key>fonts</key>
-      <map>
-        <key>copyright</key>
-        <string>Copyright various</string>
-        <key>description</key>
-        <string>Viewer fonts</string>
-        <key>license</key>
-        <string>Various open source</string>
-        <key>license_file</key>
-        <string>LICENSES/fonts.txt</string>
-        <key>name</key>
-        <string>fonts</string>
-        <key>platforms</key>
-        <map>
-          <key>common</key>
-          <map>
-            <key>archive</key>
-            <map>
-              <key>hash</key>
-              <string>65b89f06d9b698b376e1736216dd5623</string>
-              <key>url</key>
-              <string>viewer_fonts-1.0-1.tar.bz2</string>
-            </map>
-            <key>name</key>
-            <string>common</string>
-          </map>
-        </map>
-        <key>version</key>
-        <string>1.0</string>
-      </map>
       <key>fontconfig</key>
       <map>
         <key>copyright</key>
@@ -1902,36 +1872,6 @@
         <key>version</key>
         <string>7.11.1.297294</string>
       </map>
-	  <key>nanosvg</key>
-      <map>
-        <key>copyright</key>
-        <string>Copyright (c) 2013-14 Mikko Mononen</string>
-        <key>description</key>
-        <string>NanoSVG is a simple single-header-file SVG parser and rasterizer</string>
-        <key>license</key>
-        <string>Zlib</string>
-        <key>license_file</key>
-        <string>LICENSES/nanosvg.txt</string>
-        <key>name</key>
-        <string>nanosvg</string>
-        <key>platforms</key>
-        <map>
-          <key>common</key>
-          <map>
-            <key>archive</key>
-            <map>
-              <key>hash</key>
-              <string>aa73d8b6c45168b74e2cc4640ec01f95</string>
-              <key>url</key>
-              <string>nanosvg-2022.09.27-common-223101446.tar.bz2</string>
-            </map>
-            <key>name</key>
-            <string>common</string>
-          </map>
-        </map>
-        <key>version</key>
-        <string>2022.09.27</string>
-      </map>
       <key>meshoptimizer</key>
       <map>
         <key>canonical_repo</key>
@@ -2044,6 +1984,74 @@
         <key>version</key>
         <string>3.0.2.569217</string>
       </map>
+      <key>nanosvg</key>
+      <map>
+        <key>canonical_repo</key>
+        <string>https://bitbucket.org/lindenlab/3p-nanosvg</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2013-14 Mikko Mononen</string>
+        <key>description</key>
+        <string>NanoSVG is a simple single-header-file SVG parser and rasterizer</string>
+        <key>license</key>
+        <string>Zlib</string>
+        <key>license_file</key>
+        <string>LICENSES/LICENSE.txt</string>
+        <key>name</key>
+        <string>nanosvg</string>
+        <key>platforms</key>
+        <map>
+          <key>darwin64</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>94b8670d171700f24af2fcfc8bf7d608</string>
+              <key>url</key>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107183/935568/nanosvg-2022.09.27-darwin64-576467.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>darwin64</string>
+          </map>
+          <key>linux</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>c5a2ae5ecc8ade5a85b674e4426d6403</string>
+              <key>url</key>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107186/935576/nanosvg-2022.09.27-linux-576467.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>linux</string>
+          </map>
+          <key>windows</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>8fa416e04ca768c1d8fa4ad3a0104b24</string>
+              <key>url</key>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107184/935580/nanosvg-2022.09.27-windows-576467.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>windows</string>
+          </map>
+          <key>windows64</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>08ea3f1d23cf78d1eb65597cef5913b4</string>
+              <key>url</key>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107182/935563/nanosvg-2022.09.27-windows64-576467.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>windows64</string>
+          </map>
+        </map>
+        <key>version</key>
+        <string>2022.09.27</string>
+      </map>
       <key>nghttp2</key>
       <map>
         <key>copyright</key>
@@ -2787,9 +2795,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>9655e501340262e1feea9e71543d3eab</string>
+              <string>64dfdcfb6f5c98f134c128ed64fe810c</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/106526/930682/viewer_fonts-1.576098-darwin64-576098.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107187/935585/viewer_fonts-1.576468-darwin64-576468.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -2799,9 +2807,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>eb98887e363854810e03861f258e534d</string>
+              <string>50f83d09145601df7f0f51e503f071d7</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/106533/930714/viewer_fonts-1.576098-windows-576098.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107188/935596/viewer_fonts-1.576468-windows-576468.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -2811,16 +2819,16 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>365c0d38cde826c3c1e31bc68b5d1194</string>
+              <string>212833fe0e054874cceaec567a46a851</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/106527/930690/viewer_fonts-1.576098-windows64-576098.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107189/935597/viewer_fonts-1.576468-windows64-576468.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>1.576098</string>
+        <string>1.576468</string>
       </map>
       <key>viewer-manager</key>
       <map>
diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake
index aa204a7406..9b365c159a 100644
--- a/indra/cmake/ViewerMiscLibs.cmake
+++ b/indra/cmake/ViewerMiscLibs.cmake
@@ -10,5 +10,5 @@ if (NOT USESYSTEMLIBS)
   use_prebuilt_binary(slvoice)
 endif(NOT USESYSTEMLIBS)
 
-use_prebuilt_binary(fonts)
-use_prebuilt_binary(nanosvg)
\ No newline at end of file
+use_prebuilt_binary(nanosvg)
+use_prebuilt_binary(viewer-fonts)