From 9ee9dc841dcee435cccce9051b9dd18f97783b63 Mon Sep 17 00:00:00 2001
From: Nicky Dasmijn <nicky.dasmijn@gmail.com>
Date: Mon, 20 Jul 2020 09:30:39 +0200
Subject: [PATCH] Switch to a dullahan version we can audio control while still
 have workint twitch

---
 autobuild.xml                                | 10 +++++-----
 indra/media_plugins/cef/media_plugin_cef.cpp | 11 ++++++-----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 343ba63a72..f80cead634 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -840,7 +840,7 @@
               <key>hash</key>
               <string>05bdafd8e9f32fc6763862ada4b5c4bc</string>
               <key>url</key>
-              <string>http://downloads.phoenixviewer.com/dullahan-1.7.0.202005300110_81.3.10_gb223419_chromium-81.0.4044.138-linux64-201502309.tar.bz2</string>
+              <string>http://3p.firestormviewer.org/dullahan-1.7.0.202005300110_81.3.10_gb223419_chromium-81.0.4044.138-linux64-201502309.tar.bz2</string>
             </map>
             <key>name</key>
             <string>linux64</string>
@@ -850,9 +850,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>aa4faf9ef9057362d63f8d57092506b3</string>
+              <string>579253178199688a84e9c4f11d6dc3a5</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/60902/572301/dullahan-1.7.0.202005311828_81.3.10_gb223419_chromium-81.0.4044.138-windows-543086.tar.bz2</string>
+              <string>http://3p.firestormviewer.org/dullahan-1.7.0.202007182328_81.3.10_gb223419_chromium-81.0.4044.138-windows-202002136.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -862,9 +862,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>6e29ea2ccdad80dcf1b5dc974932c1f6</string>
+              <string>8a00268cfd5fce2477420fe2ff2a56e5</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/60901/572302/dullahan-1.7.0.202005311828_81.3.10_gb223419_chromium-81.0.4044.138-windows64-543086.tar.bz2</string>
+              <string>http://3p.firestormviewer.org/dullahan-1.7.0.202007182328_81.3.10_gb223419_chromium-81.0.4044.138-windows64-202002125.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp
index 36875876c9..31b8cc7361 100644
--- a/indra/media_plugins/cef/media_plugin_cef.cpp
+++ b/indra/media_plugins/cef/media_plugin_cef.cpp
@@ -540,11 +540,7 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
 				settings.flip_pixels_y = true;
 				settings.frame_rate = 60;
 
-				// <FS:ND> With the latest CEF this does more worse than good. It will allow the viewer to control the audio level (apparently); But it will also break a lot of sites (among then twitch, netflix, spotify).
-				// Right now with the choice between lots of broken sites or volumes for me it's rather the sites being usable.
-				// settings.force_wave_audio = true;
-				settings.force_wave_audio = false;
-				// </FS:ND>
+				settings.force_wave_audio = true;
 
 				settings.initial_height = 1024;
 				settings.initial_width = 1024;
@@ -958,7 +954,12 @@ void MediaPluginCEF::checkEditState()
 
 void MediaPluginCEF::setVolume()
 {
+	//mVolumeCatcher.setVolume(mCurVolume);
+#ifdef LL_WINDOWS
+	mCEFLib->setVolume(mCurVolume);
+#else
 	mVolumeCatcher.setVolume(mCurVolume);
+#endif
 }
 
 ////////////////////////////////////////////////////////////////////////////////