Skip to content
Snippets Groups Projects
Commit 94ea5dce authored by callum_linden's avatar callum_linden
Browse files

pull in llceflib changes for user agent, flash plugins and pdf

parent f2a6e0f8
Branches
Tags
No related merge requests found
...@@ -1536,11 +1536,11 @@ ...@@ -1536,11 +1536,11 @@
<key>archive</key> <key>archive</key>
<map> <map>
<key>hash</key> <key>hash</key>
<string>d2a2221741c31c28ec28e974b035099c</string> <string>a58244a2348197aec11ac9f3dcf5c2ff</string>
<key>hash_algorithm</key> <key>hash_algorithm</key>
<string>md5</string> <string>md5</string>
<key>url</key> <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> </map>
<key>name</key> <key>name</key>
<string>darwin</string> <string>darwin</string>
...@@ -1550,18 +1550,18 @@ ...@@ -1550,18 +1550,18 @@
<key>archive</key> <key>archive</key>
<map> <map>
<key>hash</key> <key>hash</key>
<string>8e4a649ecc7ba1f39b5d54fed935ac14</string> <string>880970d9fa0da5922044de5716d59043</string>
<key>hash_algorithm</key> <key>hash_algorithm</key>
<string>md5</string> <string>md5</string>
<key>url</key> <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> </map>
<key>name</key> <key>name</key>
<string>windows</string> <string>windows</string>
</map> </map>
</map> </map>
<key>version</key> <key>version</key>
<string>1.4.0.308076</string> <string>1.4.0.308140</string>
</map> </map>
<key>llphysicsextensions_source</key> <key>llphysicsextensions_source</key>
<map> <map>
......
...@@ -438,7 +438,7 @@ void MediaPluginCEF::receiveMessage(const char* message_string) ...@@ -438,7 +438,7 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
settings.cache_enabled = true; settings.cache_enabled = true;
settings.cache_path = mCachePath; settings.cache_path = mCachePath;
settings.accept_language_list = mHostLanguage; settings.accept_language_list = mHostLanguage;
settings.user_agent_substring = mUserAgentSubtring; settings.user_agent_substring = mLLCEFLib->makeCompatibleUserAgentString(mUserAgentSubtring);
bool result = mLLCEFLib->init(settings); bool result = mLLCEFLib->init(settings);
if (!result) if (!result)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment