diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-03-19 21:41:40 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-03-19 21:41:40 +0200 |
| commit | 673e74606e75884e509727914c9f3a2a9700d482 (patch) | |
| tree | 9b3f8f7fcb0ac730af3a419534335fb38458e866 | |
| parent | 91baba4d9c8a7af33097cf6a7b532ca7d97d8430 (diff) | |
| parent | 72f21b399e5a07ee162116f677e643b21e54d7bb (diff) | |
Merged in callum_linden/viewer-release-cve-2019-5786
| -rw-r--r-- | autobuild.xml | 14 | ||||
| -rw-r--r-- | 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); |