From 72f21b399e5a07ee162116f677e643b21e54d7bb Mon Sep 17 00:00:00 2001
From: "callum@gmail.com" <callum@gmail.com>
Date: Mon, 18 Mar 2019 15:36:16 -0700
Subject: Pull in a change to Dullahan that allows user to specify flag that
 lets video/audio autoplay like it did before Chrome 70? (Dullahan v1.1.1320).
 Also sets a flag in media plugin CEF code to change the settings from false
 (default) to true

---
 autobuild.xml                                | 14 +++++++-------
 indra/media_plugins/cef/media_plugin_cef.cpp |  1 +
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 5b84256ab8..5f072512c1 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -580,9 +580,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>29973c47ad65c18e9c45b5e95e8d3364</string>
+              <string>23aeaf23e7db2484a1850017141860dd</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/33962/282718/dullahan-1.1.1313_3.3626.1895.g7001d56-darwin64-525319.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/34069/283470/dullahan-1.1.1320_3.3626.1895.g7001d56-darwin64-525361.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -592,9 +592,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>239dc2288ab12ccfdee6c0eb91539f49</string>
+              <string>71fa66203326aca918796e874976c080</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/33964/282730/dullahan-1.1.1313_3.3626.1895.g7001d56-windows-525319.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/34070/283477/dullahan-1.1.1320_3.3626.1895.g7001d56-windows-525361.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -604,16 +604,16 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>c86a97fa3de24057575e8942c402e720</string>
+              <string>c7162e4805f50a3609f5dc63d0cf2bc0</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/33963/282731/dullahan-1.1.1313_3.3626.1895.g7001d56-windows64-525319.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/34071/283480/dullahan-1.1.1320_3.3626.1895.g7001d56-windows64-525361.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>1.1.1313_3.3626.1895.g7001d56</string>
+        <string>1.1.1320_3.3626.1895.g7001d56</string>
       </map>
       <key>elfio</key>
       <map>
diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp
index 2bd5526a86..66b316df90 100644
--- a/indra/media_plugins/cef/media_plugin_cef.cpp
+++ b/indra/media_plugins/cef/media_plugin_cef.cpp
@@ -519,6 +519,7 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
 				settings.webgl_enabled = true;
 				settings.log_file = mCefLogFile;
 				settings.log_verbose = mCefLogVerbose;
+				settings.autoplay_without_gesture = true;
 
 				std::vector<std::string> custom_schemes(1, "secondlife");
 				mCEFLib->setCustomSchemes(custom_schemes);
-- 
cgit v1.2.3


From ee39ebd523455a32234cf3d362ca96ebdcd4d86b Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Wed, 20 Mar 2019 19:40:14 +0200
Subject: Backed out changeset: 29f763ea2f9b The fix caused SL-10357

---
 indra/newview/pipeline.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 7be5c86679..e8c9909f8c 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -2514,8 +2514,8 @@ void LLPipeline::updateCull(LLCamera& camera, LLCullResult& result, S32 water_cl
 			LLSpatialPartition* part = region->getSpatialPartition(i);
 			if (part)
 			{
-				if (LLViewerRegion::PARTITION_BRIDGE == i || hasRenderType(part->mDrawableType))
-				{ //pass PARTITION BRIDGE because LLDrawable can be moved to this partition
+				if (hasRenderType(part->mDrawableType))
+				{
 					part->cull(camera);
 				}
 			}
-- 
cgit v1.2.3


From a3f4405cba135ed6b68c74e9e192273122543b9c Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 2 Apr 2019 14:34:12 -0400
Subject: Added tag 6.1.1-release for changeset 50f0ece62ddb

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index fcf043b1ea..b0da8b0d98 100755
--- a/.hgtags
+++ b/.hgtags
@@ -545,3 +545,4 @@ ac3b1332ad4f55b7182a8cbcc1254535a0069f75 5.1.7-release
 821edfcd14919c0e95c590866171c61fb57e8623 6.0.0-release
 21b7604680ef6b6ea67f8bebaaa588d6e263bdc1 6.0.1-release
 a3143db58a0f6b005232bf9018e7fef17ff9ec90 6.1.0-release
+50f0ece62ddb5a244ecb6d00ef5a89d80ad50efa 6.1.1-release
-- 
cgit v1.2.3


From 5cf18cb867be567bf921f0b94a78fd822e4112ad Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 2 Apr 2019 14:34:12 -0400
Subject: increment viewer version to 6.1.2

---
 indra/newview/VIEWER_VERSION.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt
index f3b5af39e4..5e3254243a 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-6.1.1
+6.1.2
-- 
cgit v1.2.3