From 45135a7c58d4ef2d5d79b99337ee0ba40e5d2e93 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Thu, 17 Jun 2021 12:42:58 -0700
Subject: Fix for: SL-15422 Update version of CEF used in the Viewer to
 91.0.4472.101. Also includes a tweak to viewer_manifest.py to handle some CEF
 file changes"

---
 autobuild.xml                    | 14 +++++++-------
 indra/newview/viewer_manifest.py |  8 +++-----
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 6a8ee9c7ee..b10bed7418 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -580,9 +580,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>e53ed82de49ef544860bd6af470f51f4</string>
+              <string>80581e54de126eb5533b2a0febcabe5a</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/82243/772012/dullahan-1.11.0.202105180250_89.0.17_ge7bbb1d_chromium-89.0.4389.114-darwin64-559872.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/83327/779265/dullahan-1.12.2.202106171810_91.1.12_gcf0c26a_chromium-91.0.4472.101-darwin64-560691.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -592,9 +592,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>396c013eaeea2c63f1a55bad988363e1</string>
+              <string>f605122ab32238ee96ab2999a9ca31bc</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/82244/772021/dullahan-1.11.0.202105180259_89.0.17_ge7bbb1d_chromium-89.0.4389.114-windows-559872.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/83328/779271/dullahan-1.12.2.202106171811_91.1.19_ga92e5d5_chromium-91.0.4472.101-windows-560691.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -604,16 +604,16 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>557e4ae265e67d5cd8799e8f1a291e56</string>
+              <string>7ee7f0121c1709c5b66c6dc14a84d8c2</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/82245/772026/dullahan-1.11.0.202105180259_89.0.17_ge7bbb1d_chromium-89.0.4389.114-windows64-559872.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/83329/779276/dullahan-1.12.2.202106171811_91.1.19_ga92e5d5_chromium-91.0.4472.101-windows64-560691.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>1.11.0.202105180259_89.0.17_ge7bbb1d_chromium-89.0.4389.114</string>
+        <string>1.12.2.202106171811_91.1.19_ga92e5d5_chromium-91.0.4472.101</string>
       </map>
       <key>elfio</key>
       <map>
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 0207256e96..7103a21efc 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -622,11 +622,9 @@ class WindowsManifest(ViewerManifest):
 
             # CEF files common to all configurations
             with self.prefix(src=os.path.join(pkgdir, 'resources')):
-                self.path("cef.pak")
-                self.path("cef_100_percent.pak")
-                self.path("cef_200_percent.pak")
-                self.path("cef_extensions.pak")
-                self.path("devtools_resources.pak")
+                self.path("chrome_100_percent.pak")
+                self.path("chrome_200_percent.pak")
+                self.path("resources.pak")
                 self.path("icudtl.dat")
 
             with self.prefix(src=os.path.join(pkgdir, 'resources', 'locales'), dst='locales'):
-- 
cgit v1.2.3