Bring in Dullahan 1.20.0 and by that, CEF 139.0.28. Update the CEF media plugin accordingly to take account of Dullahan cache changes

2 files changed, 6 insertions, 20 deletions

diff --git a/autobuild.xml b/autobuild.xml
index 5dcc9a980a..2f2ab55012 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -448,11 +448,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>8f3672e548c140a48296669b65cb4ce9a54154e2</string>
+              <string>67f6df74e64ec7706b59192dbdef1d0da2754127</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/dullahan/releases/download/v1.16.0-CEF_139.0.17/dullahan-1.16.0.202508120105_139.0.17_g6c347eb_chromium-139.0.7258.31-darwin64-16896111303.tar.zst</string>
+              <string>https://github.com/secondlife/dullahan/releases/download/v1.20.0-CEF_139.0.28a/dullahan-1.20.0.202508222243_139.0.28_g55ab8a8_chromium-139.0.7258.139-darwin64-17167490569.tar.zst</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -476,11 +476,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>ec077eb13edf0b69324d73b49bb434e69e67d2d0</string>
+              <string>7fe15918eeeb5121b6c5af9427f581a775b88758</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/dullahan/releases/download/v1.16.0-CEF_139.0.17/dullahan-1.16.0.202508120105_139.0.17_g6c347eb_chromium-139.0.7258.31-windows64-16896111303.tar.zst</string>
+              <string>https://github.com/secondlife/dullahan/releases/download/v1.20.0-CEF_139.0.28a/dullahan-1.20.0.202508222244_139.0.28_g55ab8a8_chromium-139.0.7258.139-windows64-17167490569.tar.zst</string>
             </map>
             <key>name</key>
             <string>windows64</string>
@@ -493,7 +493,7 @@
         <key>copyright</key>
         <string>Copyright (c) 2017, Linden Research, Inc.</string>
         <key>version</key>
-        <string>1.16.0.202508120105_139.0.17_g6c347eb_chromium-139.0.7258.31</string>
+        <string>1.20.0.202508222243_139.0.28_g55ab8a8_chromium-139.0.7258.139</string>
         <key>name</key>
         <string>dullahan</string>
         <key>description</key>
diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp
index 3f45ac971a..52df4a9685 100644
--- a/indra/media_plugins/cef/media_plugin_cef.cpp
+++ b/indra/media_plugins/cef/media_plugin_cef.cpp
@@ -110,8 +110,6 @@ private:
     bool mCanCopy;
     bool mCanPaste;
     std::string mRootCachePath;
-    std::string mCachePath;
-    std::string mContextCachePath;
     std::string mCefLogFile;
     bool mCefLogVerbose;
     std::vector<std::string> mPickedFiles;
@@ -149,7 +147,6 @@ MediaPluginBase(host_send_func, host_user_data)
     mCanCut = false;
     mCanCopy = false;
     mCanPaste = false;
-    mCachePath = "";
     mCefLogFile = "";
     mCefLogVerbose = false;
     mPickedFiles.clear();
@@ -649,10 +646,7 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
                 // and set it to white
                 settings.background_color = 0xffffffff; // white
 
-                settings.cache_enabled = true;
                 settings.root_cache_path = mRootCachePath;
-                settings.cache_path = mCachePath;
-                settings.context_cache_path = mContextCachePath;
                 settings.cookies_enabled = mCookiesEnabled;
 
                 // configure proxy argument if enabled and valid
@@ -768,15 +762,7 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
                 mRootCachePath += std::to_string(getpid());
 # endif
 
-                if (!subfolder.empty())
-                {
-                    mCachePath = mRootCachePath + path_separator + subfolder;
-                }
-                else
-                {
-                    mCachePath = mRootCachePath;
-                }
-                mContextCachePath = ""; // disabled by ""
+
                 mCefLogFile = message_in.getValue("cef_log_file");
                 mCefLogVerbose = message_in.getValueBoolean("cef_verbose_log");
             }