From 94ea5dce50e97aa6ee7bd36790a995c9ae4dbeba Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Fri, 20 Nov 2015 17:34:46 -0800
Subject: [PATCH] pull in llceflib changes for user agent, flash plugins and
pdf
---
autobuild.xml | 10 +++++-----
indra/media_plugins/cef/media_plugin_cef.cpp | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index dc002f10802..4d77a74c5b0 100755
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1536,11 +1536,11 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>d2a2221741c31c28ec28e974b035099c</string>
+ <string>a58244a2348197aec11ac9f3dcf5c2ff</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llceflib_3p-llceflib/rev/308076/arch/Darwin/installer/llceflib-1.4.0.308076-darwin-308076.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llceflib_3p-llceflib/rev/308140/arch/Darwin/installer/llceflib-1.4.0.308140-darwin-308140.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@@ -1550,18 +1550,18 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>8e4a649ecc7ba1f39b5d54fed935ac14</string>
+ <string>880970d9fa0da5922044de5716d59043</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llceflib_3p-llceflib/rev/308076/arch/CYGWIN/installer/llceflib-1.4.0.308076-windows-308076.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llceflib_3p-llceflib/rev/308140/arch/CYGWIN/installer/llceflib-1.4.0.308140-windows-308140.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
<key>version</key>
- <string>1.4.0.308076</string>
+ <string>1.4.0.308140</string>
</map>
<key>llphysicsextensions_source</key>
<map>
diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp
index 182b7f25465..c8a52ff5fe6 100644
--- a/indra/media_plugins/cef/media_plugin_cef.cpp
+++ b/indra/media_plugins/cef/media_plugin_cef.cpp
@@ -438,7 +438,7 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
settings.cache_enabled = true;
settings.cache_path = mCachePath;
settings.accept_language_list = mHostLanguage;
- settings.user_agent_substring = mUserAgentSubtring;
+ settings.user_agent_substring = mLLCEFLib->makeCompatibleUserAgentString(mUserAgentSubtring);
bool result = mLLCEFLib->init(settings);
if (!result)
--
GitLab